From d169ea09c5314485d07ddca944549b7a9e5f56b5 Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Tue, 26 Jan 2016 19:23:18 +0800 Subject: [PATCH] Optimize `TestEventsContainerFailStartDie` Optimize performance of `TestEventsContainerFailStartDie` Signed-off-by: Zhang Wei Upstream-commit: 4f7dda3fb29b2ac39731b1a54571ad96435fff83 Component: engine --- .../engine/integration-cli/docker_cli_events_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_events_test.go b/components/engine/integration-cli/docker_cli_events_test.go index aaeb1b0931..28ba90e1be 100644 --- a/components/engine/integration-cli/docker_cli_events_test.go +++ b/components/engine/integration-cli/docker_cli_events_test.go @@ -66,12 +66,10 @@ func (s *DockerSuite) TestEventsUntag(c *check.C) { } func (s *DockerSuite) TestEventsContainerFailStartDie(c *check.C) { - out, _ := dockerCmd(c, "images", "-q") - image := strings.Split(out, "\n")[0] - _, _, err := dockerCmdWithError("run", "--name", "testeventdie", image, "blerg") - c.Assert(err, checker.NotNil, check.Commentf("Container run with command blerg should have failed, but it did not, out=%s", out)) + _, _, err := dockerCmdWithError("run", "--name", "testeventdie", "busybox", "blerg") + c.Assert(err, checker.NotNil, check.Commentf("Container run with command blerg should have failed, but it did not")) - out, _ = dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix())) + out, _ := dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix())) events := strings.Split(strings.TrimSpace(out), "\n") nEvents := len(events)