os: IsNotExist() should also consider ERROR_PATH_NOT_FOUND on Windows

    Also update documentation about IsExist() and IsNotExist(), they are not
    about files only.

R=rsc
CC=golang-dev
https://golang.org/cl/5794073

diff --git a/src/pkg/os/error.go b/src/pkg/os/error.go
index 54c2dc63990ffd7435835fbe0d04ded87562be17..b88e49400de9a3356a1c8df853add3197d758c97 100644 (file)
--- a/src/pkg/os/error.go
+++ b/src/pkg/os/error.go
@@ -43,14 +43,14 @@ func NewSyscallError(syscall string, err error) error {
        return &SyscallError{syscall, err}
 }
 
-// IsExist returns whether the error is known to report that a file already exists.
-// It is satisfied by ErrExist as well as some syscall errors.
+// IsExist returns whether the error is known to report that a file or directory 
+// already exists. It is satisfied by ErrExist as well as some syscall errors.
 func IsExist(err error) bool {
        return isExist(err)
 }
 
-// IsNotExist returns whether the error is known to report that a file does not exist.
-// It is satisfied by ErrNotExist as well as some syscall errors.
+// IsNotExist returns whether the error is known to report that a file or directory
+// does not exist. It is satisfied by ErrNotExist as well as some syscall errors.
 func IsNotExist(err error) bool {
        return isNotExist(err)
 }

diff --git a/src/pkg/os/error_test.go b/src/pkg/os/error_test.go
index 8218f861aff34d84477e18af53c3907b3256c128..42f846fa3c59b8fcf47071272be18047c32ab775 100644 (file)
--- a/src/pkg/os/error_test.go
+++ b/src/pkg/os/error_test.go
@@ -5,8 +5,10 @@
 package os_test
 
 import (
+       "fmt"
        "io/ioutil"
        "os"
+       "path/filepath"
        "testing"
 )
 
@@ -24,8 +26,56 @@ func TestErrIsExist(t *testing.T) {
                t.Fatal("Open should have failed")
                return
        }
-       if !os.IsExist(err) {
-               t.Fatalf("os.IsExist does not work as expected for %#v", err)
+       if s := checkErrorPredicate("os.IsExist", os.IsExist, err); s != "" {
+               t.Fatal(s)
                return
        }
 }
+
+func testErrNotExist(name string) string {
+       f, err := os.Open(name)
+       if err == nil {
+               f.Close()
+               return "Open should have failed"
+       }
+       if s := checkErrorPredicate("os.IsNotExist", os.IsNotExist, err); s != "" {
+               return s
+       }
+
+       err = os.Chdir(name)
+       if err == nil {
+               return "Chdir should have failed"
+       }
+       if s := checkErrorPredicate("os.IsNotExist", os.IsNotExist, err); s != "" {
+               return s
+       }
+       return ""
+}
+
+func TestErrIsNotExist(t *testing.T) {
+       tmpDir, err := ioutil.TempDir("", "_Go_ErrIsNotExist")
+       if err != nil {
+               t.Fatalf("create ErrIsNotExist tempdir: %s", err)
+               return
+       }
+       defer os.RemoveAll(tmpDir)
+
+       name := filepath.Join(tmpDir, "NotExists")
+       if s := testErrNotExist(name); s != "" {
+               t.Fatal(s)
+               return
+       }
+
+       name = filepath.Join(name, "NotExists2")
+       if s := testErrNotExist(name); s != "" {
+               t.Fatal(s)
+               return
+       }
+}
+
+func checkErrorPredicate(predName string, pred func(error) bool, err error) string {
+       if !pred(err) {
+               return fmt.Sprintf("%s does not work as expected for %#v", predName, err)
+       }
+       return ""
+}

diff --git a/src/pkg/os/error_windows.go b/src/pkg/os/error_windows.go
index b8b894b5a29aad37aa6de6e65d1890ab1598345d..5d692b07362bd6e2c10380909cceefa0633cc0d4 100644 (file)
--- a/src/pkg/os/error_windows.go
+++ b/src/pkg/os/error_windows.go
@@ -10,7 +10,7 @@ func isExist(err error) bool {
        if pe, ok := err.(*PathError); ok {
                err = pe.Err
        }
-       return err == syscall.EEXIST || err == syscall.ERROR_ALREADY_EXISTS ||
+       return err == syscall.ERROR_ALREADY_EXISTS ||
                err == syscall.ERROR_FILE_EXISTS || err == ErrExist
 }
 
@@ -18,12 +18,13 @@ func isNotExist(err error) bool {
        if pe, ok := err.(*PathError); ok {
                err = pe.Err
        }
-       return err == syscall.ENOENT || err == ErrNotExist
+       return err == syscall.ERROR_FILE_NOT_FOUND ||
+               err == syscall.ERROR_PATH_NOT_FOUND || err == ErrNotExist
 }
 
 func isPermission(err error) bool {
        if pe, ok := err.(*PathError); ok {
                err = pe.Err
        }
-       return err == syscall.EACCES || err == syscall.EPERM || err == ErrPermission
+       return err == ErrPermission
 }