From e0de1718ee269776c7b23a1b03d796800ed4f451 Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Sat, 11 Jun 2016 06:51:09 +0000 Subject: [PATCH] Improve the UT As the #23387 comment, the temp fix for UT need to be improved to make it test the expected behavior. So let's add it. Signed-off-by: Kai Qiang Wu(Kennan) --- integration-cli/docker_cli_events_unix_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go index d0a25ed2bf..758517b736 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/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") 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(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, "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) {