From 6a25ce081f84e2e1f32d87c350ae4d09317d5b73 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 28 Jun 2016 13:36:10 -0400 Subject: [PATCH] DockerExternalVolumeSuite: add daemon to test Part of #23998. Adds a daemon to this test, so that the volume that's created is added to this test daemon's vol store instead of the main test daemons. Signed-off-by: Christopher Jones Upstream-commit: 88ea43d2aafb602290403c365bb4892c63320fc1 Component: engine --- .../docker_cli_external_volume_driver_unix_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_external_volume_driver_unix_test.go b/components/engine/integration-cli/docker_cli_external_volume_driver_unix_test.go index 61a832ad2f..4f13b8dd7f 100644 --- a/components/engine/integration-cli/docker_cli_external_volume_driver_unix_test.go +++ b/components/engine/integration-cli/docker_cli_external_volume_driver_unix_test.go @@ -472,8 +472,12 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverWithDaemonRestart(c // Ensures that the daemon handles when the plugin responds to a `Get` request with a null volume and a null error. // Prior the daemon would panic in this scenario. func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGetEmptyResponse(c *check.C) { - dockerCmd(c, "volume", "create", "-d", "test-external-volume-driver", "--name", "abc2", "--opt", "ninja=1") - out, _, err := dockerCmdWithError("volume", "inspect", "abc2") + c.Assert(s.d.Start(), checker.IsNil) + + out, err := s.d.Cmd("volume", "create", "-d", "test-external-volume-driver", "--name", "abc2", "--opt", "ninja=1") + c.Assert(err, checker.IsNil, check.Commentf(out)) + + out, err = s.d.Cmd("volume", "inspect", "abc2") c.Assert(err, checker.NotNil, check.Commentf(out)) c.Assert(out, checker.Contains, "No such volume") }