From 07d2c31810feca8d0c9a04e0da71fa9322bce37e Mon Sep 17 00:00:00 2001 From: Wen Cheng Ma Date: Tue, 26 Jan 2016 14:53:10 +0800 Subject: [PATCH] Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress Signed-off-by: Wen Cheng Ma --- integration-cli/docker_cli_daemon_test.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index c88c9694aa..8faf0719be 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -1757,17 +1757,11 @@ func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) { } func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) { - for _, driver := range []string{ - "syslog", - "gelf", - } { - args := []string{"--log-driver=" + driver, "--log-opt", driver + "-address=corrupted:42"} - c.Assert(s.d.Start(args...), check.NotNil, check.Commentf(fmt.Sprintf("Expected daemon not to start with invalid %s-address provided", driver))) - expected := fmt.Sprintf("Failed to set log opts: %s-address should be in form proto://address", driver) - runCmd := exec.Command("grep", expected, s.d.LogfileName()) - if out, _, err := runCommandWithOutput(runCmd); err != nil { - c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err) - } + c.Assert(s.d.Start("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil) + expected := "Failed to set log opts: syslog-address should be in form proto://address" + runCmd := exec.Command("grep", expected, s.d.LogfileName()) + if out, _, err := runCommandWithOutput(runCmd); err != nil { + c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err) } }