From 27e104ba09d2d7c8d35673406e71871af941c386 Mon Sep 17 00:00:00 2001 From: Andy Pan Date: Fri, 23 Feb 2024 12:09:04 +0800 Subject: [PATCH] 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 Reviewed-by: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI TryBot-Result: Gopher Robot Commit-Queue: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Run-TryBot: Andy Pan --- src/os/os_test.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/os/os_test.go b/src/os/os_test.go index e094edd826..68a3a03e2a 100644 --- 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) } -- 2.48.1