Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork

fix TestEventsContainerWithMultiNetwork
This commit is contained in:
Sebastiaan van Stijn 2016-06-09 01:03:17 +02:00
commit b47bf3dc69
1 changed files with 4 additions and 2 deletions

View File

@ -244,12 +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
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-1") 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-2") c.Assert(netEvents[1], checker.Contains, "test-event-network-local-")
} }
func (s *DockerSuite) TestEventsStreaming(c *check.C) { func (s *DockerSuite) TestEventsStreaming(c *check.C) {