From 530db7f45ae4969637bc89e5bc3169d839c10494 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 28 Sep 2018 12:09:52 +0200 Subject: [PATCH] Tweak bind mount errors These messages were enhanced to include the path that was missing (in df6af282b9048dfedcd7b7a9a89126aca887f4e1), but also changed the first part of the message. This change complicates running e2e tests with mixed versions of the engine. Looking at the full error message, "mount" is a bit redundant as well, because the error message already indicates this is about a "mount"; docker run --rm --mount type=bind,source=/no-such-thing,target=/foo busybox docker: Error response from daemon: invalid mount config for type "bind": bind mount source path does not exist: /no-such-thing. Removing the "mount" part from the error message, because it was redundant, and makes cross-version testing easier :) Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 574db7a53782c57554089c9606505af1c108df0b) Signed-off-by: Sebastiaan van Stijn Upstream-commit: b499acc0e834e11882909269238407c65f68f034 Component: engine --- .../engine/integration-cli/docker_api_containers_test.go | 2 +- components/engine/volume/mounts/parser_test.go | 4 ++-- components/engine/volume/mounts/validate.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/integration-cli/docker_api_containers_test.go b/components/engine/integration-cli/docker_api_containers_test.go index ca90e152f6..ef67894106 100644 --- a/components/engine/integration-cli/docker_api_containers_test.go +++ b/components/engine/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{ diff --git a/components/engine/volume/mounts/parser_test.go b/components/engine/volume/mounts/parser_test.go index 347f7d9c4d..27257d62bd 100644 --- a/components/engine/volume/mounts/parser_test.go +++ b/components/engine/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`, diff --git a/components/engine/volume/mounts/validate.go b/components/engine/volume/mounts/validate.go index 0b71526901..9fc9109021 100644 --- a/components/engine/volume/mounts/validate.go +++ b/components/engine/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 {