From 1f266d40f3844d1e398186cb98b4deb2272ebd6c Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Mon, 13 Jun 2016 17:18:31 -0700
Subject: [PATCH] Fix race in
DockerExternalGraphdriverSuite.TestExternalGraphDriver
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
integration-cli/docker_cli_external_graphdriver_unix_test.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go
index 1c3daa425f..014b85c284 100644
--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go
+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go
@@ -348,7 +348,7 @@ func (s *DockerExternalGraphdriverSuite) testExternalGraphDriver(name string, ex
c.Assert(err, check.IsNil, check.Commentf("\n%s", string(b)))
}
- out, err := s.d.Cmd("run", "-d", "--name=graphtest", "busybox", "sh", "-c", "echo hello > /hello")
+ out, err := s.d.Cmd("run", "--name=graphtest", "busybox", "sh", "-c", "echo hello > /hello")
c.Assert(err, check.IsNil, check.Commentf(out))
err = s.d.Restart("-s", name)
@@ -359,7 +359,7 @@ func (s *DockerExternalGraphdriverSuite) testExternalGraphDriver(name string, ex
out, err = s.d.Cmd("diff", "graphtest")
c.Assert(err, check.IsNil, check.Commentf(out))
- c.Assert(strings.Contains(out, "A /hello"), check.Equals, true)
+ c.Assert(strings.Contains(out, "A /hello"), check.Equals, true, check.Commentf("diff ouput: %s", out))
out, err = s.d.Cmd("rm", "-f", "graphtest")
c.Assert(err, check.IsNil, check.Commentf(out))