os: avoid writing within the tree during testing CopyFS

Change-Id: I1d3e7c100ddfbd2ea9a7bb9e8efae89893c8365a
Reviewed-on: https://go-review.googlesource.com/c/go/+/566335
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Commit-Queue: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Andy Pan <panjf2000@gmail.com>

diff --git a/src/os/os_test.go b/src/os/os_test.go
index e094edd8264f11aab794b396d3caf869de369f5b..68a3a03e2a1d3cfa044777d830bbfc97455da22f 100644 (file)
--- a/src/os/os_test.go
+++ b/src/os/os_test.go
@@ -3450,7 +3450,7 @@ func TestCopyFSWithSymlinks(t *testing.T) {
 
        // Create a directory and file outside.
        tmpDir := t.TempDir()
-       outsideDir, err := MkdirTemp(tmpDir, "copyfs")
+       outsideDir, err := MkdirTemp(tmpDir, "copyfs_out_")
        if err != nil {
                t.Fatalf("MkdirTemp: %v", err)
        }
@@ -3461,15 +3461,10 @@ func TestCopyFSWithSymlinks(t *testing.T) {
        }
 
        // Create a directory and file inside.
-       testDataDir, err := filepath.Abs("./testdata/")
+       insideDir, err := MkdirTemp(tmpDir, "copyfs_in_")
        if err != nil {
-               t.Fatalf("filepath.Abs: %v", err)
-       }
-       insideDir := filepath.Join(testDataDir, "copyfs")
-       if err := Mkdir(insideDir, 0755); err != nil {
-               t.Fatalf("Mkdir: %v", err)
+               t.Fatalf("MkdirTemp: %v", err)
        }
-       defer RemoveAll(insideDir)
        insideFile := filepath.Join(insideDir, "file.in.txt")
        if err := WriteFile(insideFile, []byte("Testing CopyFS inside"), 0644); err != nil {
                t.Fatalf("WriteFile: %v", err)
@@ -3514,7 +3509,7 @@ func TestCopyFSWithSymlinks(t *testing.T) {
        // Copy the directory tree and verify.
        forceMFTUpdateOnWindows(t, insideDir)
        fsys := DirFS(insideDir)
-       tmpDupDir, err := MkdirTemp(tmpDir, "copyfs_dup")
+       tmpDupDir, err := MkdirTemp(tmpDir, "copyfs_dup_")
        if err != nil {
                t.Fatalf("MkdirTemp: %v", err)
        }