@@ -1014,17 +1014,25 @@ func (s *DockerAPISuite) TestContainerAPIDeleteRemoveLinks(c *testing.T) {

 func (s *DockerAPISuite) TestContainerAPIDeleteRemoveVolume(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon)

-	vol := "/testvolume"

+	testVol := "/testvolume"

 	if testEnv.DaemonInfo.OSType == "windows" {

-		vol = `c:\testvolume`

+		testVol = `c:\testvolume`

 	}

-	id := runSleepingContainer(c, "-v", vol)

+	id := runSleepingContainer(c, "-v", testVol)

 	cli.WaitRun(c, id)

-	source, err := inspectMountSourceField(id, vol)

+	apiClient, err := client.NewClientWithOpts(client.FromEnv)

 	assert.NilError(c, err)

-	_, err = os.Stat(source)

+	defer apiClient.Close()

+

+	ctrInspect, err := apiClient.ContainerInspect(testutil.GetContext(c), id)

+	assert.NilError(c, err)

+	assert.Assert(c, is.Len(ctrInspect.Mounts, 1), "expected to have 1 mount")

+	mnt := ctrInspect.Mounts[0]

+	assert.Equal(c, mnt.Destination, testVol)

+

+	_, err = os.Stat(mnt.Source)

 	assert.NilError(c, err)

 	removeOptions := container.RemoveOptions{

@@ -1032,14 +1040,10 @@ func (s *DockerAPISuite) TestContainerAPIDeleteRemoveVolume(c *testing.T) {

 		RemoveVolumes: true,

 	}

-	apiClient, err := client.NewClientWithOpts(client.FromEnv)

-	assert.NilError(c, err)

-	defer apiClient.Close()

-

 	err = apiClient.ContainerRemove(testutil.GetContext(c), id, removeOptions)

 	assert.NilError(c, err)

-	_, err = os.Stat(source)

+	_, err = os.Stat(mnt.Source)

 	assert.Assert(c, os.IsNotExist(err), "expected to get ErrNotExist error, got %v", err)

 }

@@ -152,10 +152,10 @@ func (s *DockerCLICreateSuite) TestCreateVolumesCreated(c *testing.T) {

 	const name = "test_create_volume"

 	cli.DockerCmd(c, "create", "--name", name, "-v", prefix+slash+"foo", "busybox")

-	dir, err := inspectMountSourceField(name, prefix+slash+"foo")

+	mnt, err := inspectMountPoint(name, prefix+slash+"foo")

 	assert.Assert(c, err == nil, "Error getting volume host path: %q", err)

-	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {

+	if _, err := os.Stat(mnt.Source); err != nil && os.IsNotExist(err) {

 		c.Fatalf("Volume was not created")

 	}

 	if err != nil {

@@ -76,7 +76,7 @@ func (s *DockerCLIRestartSuite) TestRestartWithVolumes(c *testing.T) {

 	out = strings.Trim(out, " \n\r")

 	assert.Equal(c, out, "1")

-	source, err := inspectMountSourceField(cID, prefix+slash+"test")

+	mnt, err := inspectMountPoint(cID, prefix+slash+"test")

 	assert.NilError(c, err)

 	cli.DockerCmd(c, "restart", cID)

@@ -86,9 +86,9 @@ func (s *DockerCLIRestartSuite) TestRestartWithVolumes(c *testing.T) {

 	out = strings.Trim(out, " \n\r")

 	assert.Equal(c, out, "1")

-	sourceAfterRestart, err := inspectMountSourceField(cID, prefix+slash+"test")

+	mountAfterRestart, err := inspectMountPoint(cID, prefix+slash+"test")

 	assert.NilError(c, err)

-	assert.Equal(c, source, sourceAfterRestart)

+	assert.Equal(c, mnt.Source, mountAfterRestart.Source)

 }

 func (s *DockerCLIRestartSuite) TestRestartDisconnectedContainer(c *testing.T) {

@@ -639,7 +639,7 @@ func (s *DockerCLIRunSuite) TestRunCreateVolumeWithSymlink(c *testing.T) {

 		c.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)

 	}

-	volPath, err := inspectMountSourceField("test-createvolumewithsymlink", "/bar/foo")

+	mnt, err := inspectMountPoint("test-createvolumewithsymlink", "/bar/foo")

 	assert.NilError(c, err)

 	_, exitCode, err = dockerCmdWithError("rm", "-v", "test-createvolumewithsymlink")

@@ -647,9 +647,9 @@ func (s *DockerCLIRunSuite) TestRunCreateVolumeWithSymlink(c *testing.T) {

 		c.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)

 	}

-	_, err = os.Stat(volPath)

+	_, err = os.Stat(mnt.Source)

 	if !os.IsNotExist(err) {

-		c.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)

+		c.Fatalf("[open] (expecting 'file does not exist' error) err: %v, mnt.Source: %s", err, mnt.Source)

 	}

 }

@@ -2109,26 +2109,26 @@ func (s *DockerCLIRunSuite) TestRunVolumesCleanPaths(c *testing.T) {

 		VOLUME `+prefix+`/foo/`))

 	cli.DockerCmd(c, "run", "-v", prefix+"/foo", "-v", prefix+"/bar/", "--name", "dark_helmet", "run_volumes_clean_paths")

-	out, err := inspectMountSourceField("dark_helmet", prefix+slash+"foo"+slash)

+	mnt, err := inspectMountPoint("dark_helmet", prefix+slash+"foo"+slash)

 	if !errors.Is(err, errMountNotFound) {

-		c.Fatalf("Found unexpected volume entry for '%s/foo/' in volumes\n%q", prefix, out)

+		c.Fatalf("Found unexpected volume entry for '%s/foo/' in volumes\n%q", prefix, mnt.Source)

 	}

-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+`foo`)

+	mnt, err = inspectMountPoint("dark_helmet", prefix+slash+`foo`)

 	assert.NilError(c, err)

-	if !strings.Contains(strings.ToLower(out), strings.ToLower(testEnv.PlatformDefaults.VolumesConfigPath)) {

-		c.Fatalf("Volume was not defined for %s/foo\n%q", prefix, out)

+	if !strings.Contains(strings.ToLower(mnt.Source), strings.ToLower(testEnv.PlatformDefaults.VolumesConfigPath)) {

+		c.Fatalf("Volume was not defined for %s/foo\n%q", prefix, mnt.Source)

 	}

-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+"bar"+slash)

+	mnt, err = inspectMountPoint("dark_helmet", prefix+slash+"bar"+slash)

 	if !errors.Is(err, errMountNotFound) {

-		c.Fatalf("Found unexpected volume entry for '%s/bar/' in volumes\n%q", prefix, out)

+		c.Fatalf("Found unexpected volume entry for '%s/bar/' in volumes\n%q", prefix, mnt.Source)

 	}

-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+"bar")

+	mnt, err = inspectMountPoint("dark_helmet", prefix+slash+"bar")

 	assert.NilError(c, err)

-	if !strings.Contains(strings.ToLower(out), strings.ToLower(testEnv.PlatformDefaults.VolumesConfigPath)) {

-		c.Fatalf("Volume was not defined for %s/bar\n%q", prefix, out)

+	if !strings.Contains(strings.ToLower(mnt.Source), strings.ToLower(testEnv.PlatformDefaults.VolumesConfigPath)) {

+		c.Fatalf("Volume was not defined for %s/bar\n%q", prefix, mnt.Source)

 	}

 }

@@ -2286,23 +2286,22 @@ func (s *DockerCLIRunSuite) TestRunMountShmMqueueFromHost(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux, NotUserNamespace)

 	cli.DockerCmd(c, "run", "-d", "--name", "shmfromhost", "-v", "/dev/shm:/dev/shm", "-v", "/dev/mqueue:/dev/mqueue", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && touch /dev/mqueue/toto && top")

-	defer os.Remove("/dev/mqueue/toto")

-	defer os.Remove("/dev/shm/test")

-	volPath, err := inspectMountSourceField("shmfromhost", "/dev/shm")

+	c.Cleanup(func() {

+		err := os.Remove("/dev/shm/test")

+		assert.Check(c, err == nil || errors.Is(err, os.ErrNotExist))

+		err = os.Remove("/dev/mqueue/toto")

+		assert.Check(c, err == nil || errors.Is(err, os.ErrNotExist))

+	})

+	mnt, err := inspectMountPoint("shmfromhost", "/dev/shm")

 	assert.NilError(c, err)

-	if volPath != "/dev/shm" {

-		c.Fatalf("volumePath should have been /dev/shm, was %s", volPath)

-	}

+	assert.Equal(c, mnt.Source, "/dev/shm")

 	out := cli.DockerCmd(c, "run", "--name", "ipchost", "--ipc", "host", "busybox", "cat", "/dev/shm/test").Combined()

-	if out != "test" {

-		c.Fatalf("Output of /dev/shm/test expected test but found: %s", out)

-	}

+	assert.Equal(c, out, "test", "unexpected content for /dev/shm/test")

 	// Check that the mq was created

-	if _, err := os.Stat("/dev/mqueue/toto"); err != nil {

-		c.Fatalf("Failed to confirm '/dev/mqueue/toto' presence on host: %s", err.Error())

-	}

+	_, err = os.Stat("/dev/mqueue/toto")

+	assert.NilError(c, err, "failed to confirm '/dev/mqueue/toto' presence on host")

 }

 func (s *DockerCLIRunSuite) TestContainerNetworkMode(c *testing.T) {

@@ -102,15 +102,6 @@ func inspectFieldJSON(t *testing.T, name, field string) string {

 	return out

 }

-// Deprecated: use cli.Docker

-func inspectMountSourceField(name, destination string) (string, error) {

-	m, err := inspectMountPoint(name, destination)

-	if err != nil {

-		return "", err

-	}

-	return m.Source, nil

-}

-

 var errMountNotFound = errors.New("mount point not found")

 // Deprecated: use cli.Docker