]> Cypherpunks repositories - gostls13.git/commitdiff
fix TestRemoveAll again (tested as root this time).
authorRuss Cox <rsc@golang.org>
Wed, 11 Nov 2009 23:48:38 +0000 (15:48 -0800)
committerRuss Cox <rsc@golang.org>
Wed, 11 Nov 2009 23:48:38 +0000 (15:48 -0800)
Fixes #22.

R=r
https://golang.org/cl/154069

src/pkg/os/path_test.go

index 9b11ac1636a12147ce2a7b1cbe450013b90019f4..9b01bd5b64fdc51ac399b45e9e57be33911ebb2f 100644 (file)
@@ -134,14 +134,13 @@ func TestRemoveAll(t *testing.T) {
                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)
-       }
-       for _, s := range []string{fpath, path + "/zzz"} {
-               if _, err := Lstat(s); err == nil {
-                       t.Fatalf("Lstat %q succeeded after partial RemoveAll", s)
+               if err = Chmod(dpath, 0777); err != nil {
+                       t.Fatalf("Chmod %q 0777: %s", dpath, err)
+               }
+               for _, s := range []string{fpath, path + "/zzz"} {
+                       if _, err := Lstat(s); err == nil {
+                               t.Fatalf("Lstat %q succeeded after partial RemoveAll", s)
+                       }
                }
        }
        if err = RemoveAll(path); err != nil {