From 4581240e585d5188955507fbd1de1affcd2ffc1b Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Mon, 16 Feb 2015 16:59:41 -0800 Subject: [PATCH] integration-cli: pass platform-compatible paths to os.Symlink Although this doesn't fix the test (os.Symlink is not yet implemented for Windows), this prevents unix-style paths from being passed to os.Symlink. Also makes code cleaner for linux. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_build_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index b94a9e147..bcfc59166 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -4688,14 +4688,15 @@ func TestBuildDockerfileOutsideContext(t *testing.T) { if err := ioutil.WriteFile(filepath.Join(tmpdir, "outsideDockerfile"), []byte("FROM scratch\nENV x y"), 0644); err != nil { t.Fatal(err) } - if err := os.Symlink("../outsideDockerfile", filepath.Join(ctx, "dockerfile1")); err != nil { + if err := os.Symlink(filepath.Join("..", "outsideDockerfile"), filepath.Join(ctx, "dockerfile1")); err != nil { t.Fatal(err) } if err := os.Symlink(filepath.Join(tmpdir, "outsideDockerfile"), filepath.Join(ctx, "dockerfile2")); err != nil { t.Fatal(err) } + for _, dockerfilePath := range []string{ - "../outsideDockerfile", + filepath.Join("..", "outsideDockerfile"), filepath.Join(ctx, "dockerfile1"), filepath.Join(ctx, "dockerfile2"), } {