0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14925 from calavera/fix_volume_symlink_test

Browse source 
Remove reference to old Volumes field in inspect struct.
This commit is contained in:
Tibor Vass 2015-07-24 10:41:00 -04:00
commit 9c0bb22571
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration-cli/docker_cli_run_test.go
View file

@ -379,10 +379,9 @@ func (s *DockerSuite) TestRunCreateVolumeWithSymlink(c *check.C) {
c.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
}
var volPath string
volPath, exitCode, err = dockerCmdWithError(c, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-createvolumewithsymlink")
if err != nil || exitCode != 0 {
c.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode)
volPath, err := inspectMountSourceField("test-createvolumewithsymlink", "/bar/foo")
if err != nil {
c.Fatalf("[inspect] err: %v", err)
}
_, exitCode, err = dockerCmdWithError(c, "rm", "-v", "test-createvolumewithsymlink")
@ -390,8 +389,7 @@ func (s *DockerSuite) TestRunCreateVolumeWithSymlink(c *check.C) {
c.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
}
f, err := os.Open(volPath)
defer f.Close()
_, err = os.Stat(volPath)
if !os.IsNotExist(err) {
c.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
}