Merge pull request #37933 from thaJeztah/tweak_error_message

Tweak bind mount errors

integration-cli/docker_api_containers_test.go

@@ -1759,7 +1759,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsValidation(c *check.C) {
 					Target: destPath}}},
 			msg: "source path does not exist",
 			// FIXME(vdemeester) fails into e2e, migrate to integration/container anyway
-			// msg: "bind mount source path does not exist: " + notExistPath,
+			// msg: "source path does not exist: " + notExistPath,
 		},
 		{
 			config: containertypes.Config{

volume/mounts/parser_test.go

@@ -120,7 +120,7 @@ func TestParseMountRaw(t *testing.T) {
 			`c:\:d:\:xyzzy`:                    "invalid volume specification: ",
 			`c:`:                               "cannot be `c:`",
 			`c:\`:                              "cannot be `c:`",
-			`c:\notexist:d:`:                   `bind mount source path does not exist: c:\notexist`,
+			`c:\notexist:d:`:                   `source path does not exist: c:\notexist`,
 			`c:\windows\system32\ntdll.dll:d:`: `source path must be a directory`,
 			`name<:d:`:                         `invalid volume specification`,
 			`name>:d:`:                         `invalid volume specification`,
@@ -189,7 +189,7 @@ func TestParseMountRaw(t *testing.T) {
 			`c:\:/foo:xyzzy`:                     "invalid volume specification: ",
 			`/`:                                  "destination can't be '/'",
 			`/..`:                                "destination can't be '/'",
-			`c:\notexist:/foo`:                   `bind mount source path does not exist: c:\notexist`,
+			`c:\notexist:/foo`:                   `source path does not exist: c:\notexist`,
 			`c:\windows\system32\ntdll.dll:/foo`: `source path must be a directory`,
 			`name<:/foo`:                         `invalid volume specification`,
 			`name>:/foo`:                         `invalid volume specification`,

volume/mounts/validate.go

@@ -17,7 +17,7 @@ func (e *errMountConfig) Error() string {
 }
 
 func errBindSourceDoesNotExist(path string) error {
-	return errors.Errorf("bind mount source path does not exist: %s", path)
+	return errors.Errorf("bind source path does not exist: %s", path)
 }
 
 func errExtraField(name string) error {