From: Alex Brainman <alex.brainman@gmail.com>
Date: Fri, 25 Jan 2019 07:22:27 +0000 (+1100)
Subject: path/filepath: skip TestIssue29372 on windows, if /tmp has symilinks
X-Git-Tag: go1.12rc1~35
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=447965d4e008764a8635df6ca7d5d2e59c6d4229;p=gostls13.git

path/filepath: skip TestIssue29372 on windows, if /tmp has symilinks

TestIssue29372 is broken on windows when temporary directory has
symlink in its path.

Adjust the test to use filepath.EvalSymlinks of temporary directory,
instead of temporary directory on windows. This change is not a
proper fix, but at least it makes TestIssue29372 pass on windows-arm.

See issue for details.

Updates #29746

Change-Id: I2af8ebb89da7cb9daf027a5e49e32ee22dbd0e3d
Reviewed-on: https://go-review.googlesource.com/c/159578
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go
index cbddda88b6..9c4c7ebedc 100644
--- a/src/path/filepath/path_test.go
+++ b/src/path/filepath/path_test.go
@@ -1374,13 +1374,27 @@ func TestWalkSymlink(t *testing.T) {
 }
 
 func TestIssue29372(t *testing.T) {
-	f, err := ioutil.TempFile("", "issue29372")
+	tmpDir, err := ioutil.TempDir("", "TestIssue29372")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	if runtime.GOOS == "windows" {
+		// This test is broken on windows, if temporary directory
+		// is a symlink. See issue 29746.
+		// TODO(brainman): Remove this hack once issue #29746 is fixed.
+		tmpDir, err = filepath.EvalSymlinks(tmpDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	path := filepath.Join(tmpDir, "file.txt")
+	err = ioutil.WriteFile(path, nil, 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
-	f.Close()
-	path := f.Name()
-	defer os.Remove(path)
 
 	pathSeparator := string(filepath.Separator)
 	tests := []string{