diff options
Diffstat (limited to 'libgo/go/os/os_unix_test.go')
| -rw-r--r-- | libgo/go/os/os_unix_test.go | 54 |
1 files changed, 48 insertions, 6 deletions
diff --git a/libgo/go/os/os_unix_test.go b/libgo/go/os/os_unix_test.go index d02e07b478..e239835c6a 100644 --- a/libgo/go/os/os_unix_test.go +++ b/libgo/go/os/os_unix_test.go @@ -7,8 +7,12 @@ package os_test import ( + "io" + "io/ioutil" . "os" + "path/filepath" "runtime" + "strings" "syscall" "testing" ) @@ -39,7 +43,7 @@ func TestChown(t *testing.T) { } // Use TempDir() to make sure we're on a local file system, // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are + // on the file. On NFS, the Getgroups groups are // basically useless. f := newFile("TestChown", t) defer Remove(f.Name()) @@ -50,7 +54,7 @@ func TestChown(t *testing.T) { } // Can't change uid unless root, but can try - // changing the group id. First try our current group. + // changing the group id. First try our current group. gid := Getgid() t.Log("gid:", gid) if err = Chown(f.Name(), -1, gid); err != nil { @@ -86,7 +90,7 @@ func TestFileChown(t *testing.T) { } // Use TempDir() to make sure we're on a local file system, // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are + // on the file. On NFS, the Getgroups groups are // basically useless. f := newFile("TestFileChown", t) defer Remove(f.Name()) @@ -97,7 +101,7 @@ func TestFileChown(t *testing.T) { } // Can't change uid unless root, but can try - // changing the group id. First try our current group. + // changing the group id. First try our current group. gid := Getgid() t.Log("gid:", gid) if err = f.Chown(-1, gid); err != nil { @@ -133,7 +137,7 @@ func TestLchown(t *testing.T) { } // Use TempDir() to make sure we're on a local file system, // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are + // on the file. On NFS, the Getgroups groups are // basically useless. f := newFile("TestLchown", t) defer Remove(f.Name()) @@ -145,12 +149,15 @@ func TestLchown(t *testing.T) { linkname := f.Name() + "2" if err := Symlink(f.Name(), linkname); err != nil { + if runtime.GOOS == "android" && IsPermission(err) { + t.Skip("skipping test on Android; permission error creating symlink") + } t.Fatalf("link %s -> %s: %v", f.Name(), linkname, err) } defer Remove(linkname) // Can't change uid unless root, but can try - // changing the group id. First try our current group. + // changing the group id. First try our current group. gid := Getgid() t.Log("gid:", gid) if err = Lchown(linkname, -1, gid); err != nil { @@ -175,3 +182,38 @@ func TestLchown(t *testing.T) { checkUidGid(t, f.Name(), int(sys.Uid), int(sys.Gid)) } } + +// Issue 16919: Readdir must return a non-empty slice or an error. +func TestReaddirRemoveRace(t *testing.T) { + oldStat := *LstatP + defer func() { *LstatP = oldStat }() + *LstatP = func(name string) (FileInfo, error) { + if strings.HasSuffix(name, "some-file") { + // Act like it's been deleted. + return nil, ErrNotExist + } + return oldStat(name) + } + dir := newDir("TestReaddirRemoveRace", t) + defer RemoveAll(dir) + if err := ioutil.WriteFile(filepath.Join(dir, "some-file"), []byte("hello"), 0644); err != nil { + t.Fatal(err) + } + d, err := Open(dir) + if err != nil { + t.Fatal(err) + } + defer d.Close() + fis, err := d.Readdir(2) // notably, greater than zero + if len(fis) == 0 && err == nil { + // This is what used to happen (Issue 16919) + t.Fatal("Readdir = empty slice & err == nil") + } + if len(fis) != 0 || err != io.EOF { + t.Errorf("Readdir = %d entries: %v; want 0, io.EOF", len(fis), err) + for i, fi := range fis { + t.Errorf(" entry[%d]: %q, %v", i, fi.Name(), fi.Mode()) + } + t.FailNow() + } +} |