diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index f3f8030dee..f075948953 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -106,12 +106,9 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithVolumesRefs(c *testing.T) { c.Fatal(err, out) } - out, err := s.d.Cmd("inspect", "-f", "{{json .Mounts}}", "volrestarttest1") - assert.NilError(c, err, out) - - if _, err := inspectMountPointJSON(out, "/foo"); err != nil { - c.Fatalf("Expected volume to exist: /foo, error: %v\n", err) - } + out, err := s.d.Cmd("inspect", "-f", `{{range .Mounts}}{{.Destination}}{{"\n"}}{{end}}`, "volrestarttest1") + assert.Check(c, err) + assert.Check(c, is.Contains(strings.Split(out, "\n"), "/foo")) } // #11008 diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 6545621b3b..9fa491687c 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -132,6 +132,8 @@ func inspectMountSourceField(name, destination string) (string, error) { return m.Source, nil } +var errMountNotFound = errors.New("mount point not found") + // Deprecated: use cli.Docker func inspectMountPoint(name, destination string) (types.MountPoint, error) { out, err := inspectFilter(name, "json .Mounts") @@ -139,15 +141,8 @@ func inspectMountPoint(name, destination string) (types.MountPoint, error) { return types.MountPoint{}, err } - return inspectMountPointJSON(out, destination) -} - -var errMountNotFound = errors.New("mount point not found") - -// Deprecated: use cli.Docker -func inspectMountPointJSON(j, destination string) (types.MountPoint, error) { var mp []types.MountPoint - if err := json.Unmarshal([]byte(j), &mp); err != nil { + if err := json.Unmarshal([]byte(out), &mp); err != nil { return types.MountPoint{}, err }