Return nil in CopyOnWriteFs.MkdirAll when directory exists

Fixes #191
spf13 · Dec 17, 2018 · a5d6946 · a5d6946
1 parent 5e9f8ec
commit a5d6946
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/copyOnWriteFs.go b/copyOnWriteFs.go
@@ -282,7 +282,8 @@ func (u *CopyOnWriteFs) MkdirAll(name string, perm os.FileMode) error {
 		return u.layer.MkdirAll(name, perm)
 	}
 	if dir {
-		return ErrFileExists
+		// This is in line with how os.MkdirAll behaves.
+		return nil
 	}
 	return u.layer.MkdirAll(name, perm)
 }

diff --git a/copyOnWriteFs_test.go b/copyOnWriteFs_test.go
@@ -36,13 +36,12 @@ func TestCopyOnWrite(t *testing.T) {
 			t.Errorf("Mkdir: Got %q for %T", err, fs)
 		}
 
-		// https://github.com/spf13/afero/issues/191
-		if _, ok := fs.(*OsFs); !ok {
-			err = fs.MkdirAll(dir, 0744)
-			if err == nil || !os.IsExist(err) {
-				t.Errorf("MkdirAll:  Got %q for %T", err, fs)
-			}
+		// MkdirAll does not return an error when the directory already exists
+		err = fs.MkdirAll(dir, 0744)
+		if err != nil {
+			t.Errorf("MkdirAll:  Got %q for %T", err, fs)
 		}
+
 	}
 }