toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19190 from srust/volume_driver_parity_again

Browse Source 
Allow external volume drivers to host anonymous volumes again
Upstream-commit: 455a505749ff5db0d6f997b249234d0f1135fe5a
Component: engine
This commit is contained in:
Brian Goff
2016-01-22 15:53:06 -05:00
parent 44fa01bbec e7064f1736
commit 6c368a5493
4 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_start_volume_driver_unix_test.go
-27
View File
@@ -296,33 +296,6 @@ func hostVolumePath(name string) string {
return fmt.Sprintf("/var/lib/docker/volumes/%s", name)
}
func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverNamedCheckBindLocalVolume(c *check.C) {
err := s.d.StartWithBusybox()
c.Assert(err, checker.IsNil)
expected := s.server.URL
dockerfile := fmt.Sprintf(`FROM busybox:latest
RUN mkdir /nobindthenlocalvol
RUN echo %s > /nobindthenlocalvol/test
VOLUME ["/nobindthenlocalvol"]`, expected)
img := "test-checkbindlocalvolume"
_, err = buildImageWithOutInDamon(s.d.sock(), img, dockerfile, true)
c.Assert(err, checker.IsNil)
out, err := s.d.Cmd("run", "--rm", "--name", "test-data-nobind", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", "test-external-volume-driver", img, "cat", "/nobindthenlocalvol/test")
c.Assert(err, checker.IsNil)
c.Assert(out, checker.Contains, expected)
c.Assert(s.ec.activations, checker.Equals, 1)
c.Assert(s.ec.creations, checker.Equals, 1)
c.Assert(s.ec.removals, checker.Equals, 1)
c.Assert(s.ec.mounts, checker.Equals, 1)
c.Assert(s.ec.unmounts, checker.Equals, 1)
}
// Make sure a request to use a down driver doesn't block other requests
func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
specPath := "/etc/docker/plugins/down-driver.spec"