浏览代码

Merge pull request #23449 from HackToday/improveunit

Improve the TestEventsContainerWithMultiNetwork UT
Alexander Morozov 9 年之前
父节点
当前提交
7d7d8fa752
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      integration-cli/docker_cli_events_unix_test.go

+ 5 - 5
integration-cli/docker_cli_events_unix_test.go

@@ -244,14 +244,14 @@ func (s *DockerSuite) TestEventsContainerWithMultiNetwork(c *check.C) {
 	out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "-f", "type=network")
 	out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "-f", "type=network")
 	netEvents := strings.Split(strings.TrimSpace(out), "\n")
 	netEvents := strings.Split(strings.TrimSpace(out), "\n")
 
 
-	// NOTE: order in which disconnect takes place is undetermined,
-	// so don't check for the *full* name
+	// received two network disconnect events
 	c.Assert(len(netEvents), checker.Equals, 2)
 	c.Assert(len(netEvents), checker.Equals, 2)
 	c.Assert(netEvents[0], checker.Contains, "disconnect")
 	c.Assert(netEvents[0], checker.Contains, "disconnect")
-	c.Assert(netEvents[0], checker.Contains, "test-event-network-local-")
-
 	c.Assert(netEvents[1], checker.Contains, "disconnect")
 	c.Assert(netEvents[1], checker.Contains, "disconnect")
-	c.Assert(netEvents[1], checker.Contains, "test-event-network-local-")
+
+	//both networks appeared in the network event output
+	c.Assert(out, checker.Contains, "test-event-network-local-1")
+	c.Assert(out, checker.Contains, "test-event-network-local-2")
 }
 }
 
 
 func (s *DockerSuite) TestEventsStreaming(c *check.C) {
 func (s *DockerSuite) TestEventsStreaming(c *check.C) {