From 7f84ab28cd0921c5870986afc994b11853b45a67 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 2 Nov 2018 09:50:50 +0100 Subject: [PATCH] Integration test: use filepath.Join() to make path cross-platform Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 05e18429cf50afbc40456a6f4eff1cfd6f1da707) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 673f04f0b1afdb0a1f739b9a4a8b41ea1e015ea4 Component: engine --- components/engine/integration/volume/volume_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration/volume/volume_test.go b/components/engine/integration/volume/volume_test.go index fc5a0b87ec..24ceb439a0 100644 --- a/components/engine/integration/volume/volume_test.go +++ b/components/engine/integration/volume/volume_test.go @@ -2,7 +2,7 @@ package volume import ( "context" - "fmt" + "path/filepath" "strings" "testing" "time" @@ -37,7 +37,7 @@ func TestVolumesCreateAndList(t *testing.T) { Driver: "local", Scope: "local", Name: name, - Mountpoint: fmt.Sprintf("%s/volumes/%s/_data", testEnv.DaemonInfo.DockerRootDir, name), + Mountpoint: filepath.Join(testEnv.DaemonInfo.DockerRootDir, "volumes", name, "_data"), } assert.Check(t, is.DeepEqual(vol, expected, cmpopts.EquateEmpty()))