toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix TestEventsContainerWithMultiNetwork

Browse Source 
the order in which disconnect takes place is undetermined,
so don't check for the full name

this test was passing due to a previous bug, that
always returned the same network-name.

this bug was recently fixed in 148bcda3292563df8e433a3d7987810cd5702dec
(pull request 23375), exposing this test to be
flaky.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7d22eb072cd277048e678d6244e5fb395b34f1ff
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-06-08 23:09:20 +02:00
parent 6c2f2ddb74
commit 7eea5a2dd4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_events_unix_test.go
+4 -2
View File
@@ -244,12 +244,14 @@ func (s *DockerSuite) TestEventsContainerWithMultiNetwork(c *check.C) {
out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "-f", "type=network")
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(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, "test-event-network-local-2")
c.Assert(netEvents[1], checker.Contains, "test-event-network-local-")
}
func (s *DockerSuite) TestEventsStreaming(c *check.C) {