diff options
Diffstat (limited to 'src/pkg/os/path_test.go')
| -rw-r--r-- | src/pkg/os/path_test.go | 79 |
1 files changed, 54 insertions, 25 deletions
diff --git a/src/pkg/os/path_test.go b/src/pkg/os/path_test.go index fcd4bac54..799e3ec2f 100644 --- a/src/pkg/os/path_test.go +++ b/src/pkg/os/path_test.go @@ -7,16 +7,19 @@ package os_test import ( . "os" "testing" + "runtime" + "syscall" ) func TestMkdirAll(t *testing.T) { - // Create new dir, in _obj so it will get + // Create new dir, in _test so it will get // cleaned up by make if not by us. - path := "_obj/_TestMkdirAll_/dir/./dir2" + path := "_test/_TestMkdirAll_/dir/./dir2" err := MkdirAll(path, 0777) if err != nil { t.Fatalf("MkdirAll %q: %s", path, err) } + defer RemoveAll("_test/_TestMkdirAll_") // Already exists, should succeed. err = MkdirAll(path, 0777) @@ -34,7 +37,7 @@ func TestMkdirAll(t *testing.T) { // Can't make directory named after file. err = MkdirAll(fpath, 0777) if err == nil { - t.Fatalf("MkdirAll %q: no error") + t.Fatalf("MkdirAll %q: no error", fpath) } perr, ok := err.(*PathError) if !ok { @@ -48,7 +51,7 @@ func TestMkdirAll(t *testing.T) { ffpath := fpath + "/subdir" err = MkdirAll(ffpath, 0777) if err == nil { - t.Fatalf("MkdirAll %q: no error") + t.Fatalf("MkdirAll %q: no error", ffpath) } perr, ok = err.(*PathError) if !ok { @@ -57,13 +60,11 @@ func TestMkdirAll(t *testing.T) { if perr.Path != fpath { t.Fatalf("MkdirAll %q returned wrong error path: %q not %q", ffpath, perr.Path, fpath) } - - RemoveAll("_obj/_TestMkdirAll_") } func TestRemoveAll(t *testing.T) { // Work directory. - path := "_obj/_TestRemoveAll_" + path := "_test/_TestRemoveAll_" fpath := path + "/file" dpath := path + "/dir" @@ -104,7 +105,16 @@ func TestRemoveAll(t *testing.T) { t.Fatalf("Lstat %q succeeded after RemoveAll (second)", path) } - if Getuid() != 0 { // Test fails as root + // Determine if we should run the following test. + testit := true + if syscall.OS == "windows" { + // Chmod is not supported under windows. + testit = false + } else { + // Test fails as root. + testit = Getuid() != 0 + } + if testit { // Make directory with file and subdirectory and trigger error. if err = MkdirAll(dpath, 0777); err != nil { t.Fatalf("MkdirAll %q: %s", dpath, err) @@ -120,23 +130,17 @@ func TestRemoveAll(t *testing.T) { if err = Chmod(dpath, 0); err != nil { t.Fatalf("Chmod %q 0: %s", dpath, err) } - if err = RemoveAll(path); err == nil { - _, err := Lstat(path) - if err == nil { - t.Errorf("Can lstat %q after supposed RemoveAll", path) - } - t.Fatalf("RemoveAll %q succeeded with chmod 0 subdirectory", path, err) - } - perr, ok := err.(*PathError) - if !ok { - t.Fatalf("RemoveAll %q returned %T not *PathError", path, err) - } - if perr.Path != dpath { - t.Fatalf("RemoveAll %q failed at %q not %q", path, perr.Path, dpath) - } - if err = Chmod(dpath, 0777); err != nil { - t.Fatalf("Chmod %q 0777: %s", dpath, err) - } + + // No error checking here: either RemoveAll + // will or won't be able to remove dpath; + // either way we want to see if it removes fpath + // and path/zzz. Reasons why RemoveAll might + // succeed in removing dpath as well include: + // * running as root + // * running on a file system without permissions (FAT) + RemoveAll(path) + Chmod(dpath, 0777) + for _, s := range []string{fpath, path + "/zzz"} { if _, err := Lstat(s); err == nil { t.Fatalf("Lstat %q succeeded after partial RemoveAll", s) @@ -150,3 +154,28 @@ func TestRemoveAll(t *testing.T) { t.Fatalf("Lstat %q succeeded after RemoveAll (final)", path) } } + +func TestMkdirAllWithSymlink(t *testing.T) { + if runtime.GOOS == "windows" { + t.Log("Skipping test: symlinks don't exist under Windows") + return + } + + err := Mkdir("_test/dir", 0755) + if err != nil { + t.Fatal(`Mkdir "_test/dir":`, err) + } + defer RemoveAll("_test/dir") + + err = Symlink("dir", "_test/link") + if err != nil { + t.Fatal(`Symlink "dir", "_test/link":`, err) + } + defer RemoveAll("_test/link") + + path := "_test/link/foo" + err = MkdirAll(path, 0755) + if err != nil { + t.Errorf("MkdirAll %q: %s", path, err) + } +} |