diff options
Diffstat (limited to 'src/os/os_windows_test.go')
-rw-r--r-- | src/os/os_windows_test.go | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/src/os/os_windows_test.go b/src/os/os_windows_test.go index b0929b4f30..b4339c3f7e 100644 --- a/src/os/os_windows_test.go +++ b/src/os/os_windows_test.go @@ -35,16 +35,7 @@ func TestSameWindowsFile(t *testing.T) { t.Fatal(err) } defer os.RemoveAll(temp) - - wd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - err = os.Chdir(temp) - if err != nil { - t.Fatal(err) - } - defer os.Chdir(wd) + chdir(t, temp) f, err := os.Create("a") if err != nil { @@ -94,16 +85,7 @@ func testDirLinks(t *testing.T, tests []dirLinkTest) { t.Fatal(err) } defer os.RemoveAll(tmpdir) - - oldwd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - err = os.Chdir(tmpdir) - if err != nil { - t.Fatal(err) - } - defer os.Chdir(oldwd) + chdir(t, tmpdir) dir := filepath.Join(tmpdir, "dir") err = os.Mkdir(dir, 0777) @@ -444,15 +426,7 @@ func TestNetworkSymbolicLink(t *testing.T) { } defer os.RemoveAll(dir) - oldwd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - err = os.Chdir(dir) - if err != nil { - t.Fatal(err) - } - defer os.Chdir(oldwd) + chdir(t, dir) shareName := "GoSymbolicLinkTestShare" // hope no conflictions sharePath := filepath.Join(dir, shareName) @@ -604,16 +578,7 @@ func TestOpenVolumeName(t *testing.T) { t.Fatal(err) } defer os.RemoveAll(tmpdir) - - wd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - err = os.Chdir(tmpdir) - if err != nil { - t.Fatal(err) - } - defer os.Chdir(wd) + chdir(t, tmpdir) want := []string{"file1", "file2", "file3", "gopher.txt"} sort.Strings(want) @@ -1226,16 +1191,7 @@ func TestWindowsReadlink(t *testing.T) { if err != nil { t.Fatal(err) } - - wd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - err = os.Chdir(tmpdir) - if err != nil { - t.Fatal(err) - } - defer os.Chdir(wd) + chdir(t, tmpdir) vol := filepath.VolumeName(tmpdir) output, err := osexec.Command("cmd", "/c", "mountvol", vol, "/L").CombinedOutput() |