MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

storage: DeleteFile should return errFileNotFound for ENOENT. (#2978)

Browse Source
This commit is contained in:
Harshavardhana 2016-10-17 16:38:46 -07:00 committed by GitHub
parent 0ff359ca0e
commit 8d2347bc7b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/object-common.go
View File

@ -224,8 +224,7 @@ func cleanupDir(storage StorageAPI, volume, dirPath string) error {
delFunc = func(entryPath string) error {
if !strings.HasSuffix(entryPath, slashSeparator) {
// Delete the file entry.
err := storage.DeleteFile(volume, entryPath)
return traceError(err)
return traceError(storage.DeleteFile(volume, entryPath))
}
// If it's a directory, list and call delFunc() for each entry.

5
cmd/posix.go
View File

@ -694,6 +694,11 @@ func deleteFile(basePath, deletePath string) error {
}
// Attempt to remove path.
if err := os.Remove(preparePath(deletePath)); err != nil {
if os.IsNotExist(err) {
return errFileNotFound
} else if os.IsPermission(err) {
return errFileAccessDenied
}
return err
}
// Recursively go down the next path and delete again.

8
cmd/posix_test.go
View File

@ -678,8 +678,8 @@ func TestPosixListDir(t *testing.T) {
t.Errorf("Unable to initialize posix, %s", err)
}
if err = posixStorage.DeleteFile("bin", "yes"); !os.IsPermission(err) {
t.Errorf("expected: Permission error, got: %s", err)
if err = posixStorage.DeleteFile("bin", "yes"); err != errFileAccessDenied {
t.Errorf("expected: %s, got: %s", errFileAccessDenied, err)
}
}
@ -792,8 +792,8 @@ func TestDeleteFile(t *testing.T) {
t.Errorf("Unable to initialize posix, %s", err)
}
if err = posixStorage.DeleteFile("bin", "yes"); !os.IsPermission(err) {
t.Errorf("expected: Permission error, got: %s", err)
if err = posixStorage.DeleteFile("bin", "yes"); err != errFileAccessDenied {
t.Errorf("expected: %s, got: %s", errFileAccessDenied, err)
}
}