Made tests pickier about ReadDir.

samples/hellofs/hello_fs_test.go

@@ -22,6 +22,7 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/jacobsa/fuse/fusetesting"
 	"github.com/jacobsa/fuse/samples"
 	"github.com/jacobsa/fuse/samples/hellofs"
 	. "github.com/jacobsa/oglematchers"
@@ -54,7 +55,7 @@ func (t *HelloFSTest) SetUp(ti *TestInfo) {
 ////////////////////////////////////////////////////////////////////////
 
 func (t *HelloFSTest) ReadDir_Root() {
-	entries, err := ioutil.ReadDir(t.Dir)
+	entries, err := fusetesting.ReadDirPicky(t.Dir)
 
 	AssertEq(nil, err)
 	AssertEq(2, len(entries))
@@ -78,7 +79,7 @@ func (t *HelloFSTest) ReadDir_Root() {
 }
 
 func (t *HelloFSTest) ReadDir_Dir() {
-	entries, err := ioutil.ReadDir(path.Join(t.Dir, "dir"))
+	entries, err := fusetesting.ReadDirPicky(path.Join(t.Dir, "dir"))
 
 	AssertEq(nil, err)
 	AssertEq(1, len(entries))
@@ -94,7 +95,7 @@ func (t *HelloFSTest) ReadDir_Dir() {
 }
 
 func (t *HelloFSTest) ReadDir_NonExistent() {
-	_, err := ioutil.ReadDir(path.Join(t.Dir, "foobar"))
+	_, err := fusetesting.ReadDirPicky(path.Join(t.Dir, "foobar"))
 
 	AssertNe(nil, err)
 	ExpectThat(err, Error(HasSubstr("no such file")))

samples/memfs/memfs_test.go

@@ -98,7 +98,7 @@ func (t *MemFSTest) SetUp(ti *TestInfo) {
 ////////////////////////////////////////////////////////////////////////
 
 func (t *MemFSTest) ContentsOfEmptyFileSystem() {
-	entries, err := ioutil.ReadDir(t.Dir)
+	entries, err := fusetesting.ReadDirPicky(t.Dir)
 
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
@@ -148,13 +148,13 @@ func (t *MemFSTest) Mkdir_OneLevel() {
 	ExpectEq(0, fi.ModTime().Sub(createTime))
 
 	// Read the directory.
-	entries, err = ioutil.ReadDir(dirName)
+	entries, err = fusetesting.ReadDirPicky(dirName)
 
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
 
 	// Read the root.
-	entries, err = ioutil.ReadDir(t.Dir)
+	entries, err = fusetesting.ReadDirPicky(t.Dir)
 
 	AssertEq(nil, err)
 	AssertEq(1, len(entries))
@@ -209,13 +209,13 @@ func (t *MemFSTest) Mkdir_TwoLevels() {
 	ExpectEq(0, fi.ModTime().Sub(createTime))
 
 	// Read the directory.
-	entries, err = ioutil.ReadDir(path.Join(t.Dir, "parent/dir"))
+	entries, err = fusetesting.ReadDirPicky(path.Join(t.Dir, "parent/dir"))
 
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
 
 	// Read the parent.
-	entries, err = ioutil.ReadDir(path.Join(t.Dir, "parent"))
+	entries, err = fusetesting.ReadDirPicky(path.Join(t.Dir, "parent"))
 
 	AssertEq(nil, err)
 	AssertEq(1, len(entries))
@@ -496,7 +496,7 @@ func (t *MemFSTest) UnlinkFile_Exists() {
 	ExpectThat(err, Error(HasSubstr("no such file")))
 
 	// Nothing should be in the directory.
-	entries, err := ioutil.ReadDir(t.Dir)
+	entries, err := fusetesting.ReadDirPicky(t.Dir)
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
 }
@@ -526,7 +526,7 @@ func (t *MemFSTest) UnlinkFile_StillOpen() {
 	AssertEq(nil, err)
 
 	// The directory should no longer contain it.
-	entries, err := ioutil.ReadDir(t.Dir)
+	entries, err := fusetesting.ReadDirPicky(t.Dir)
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
 
@@ -586,7 +586,7 @@ func (t *MemFSTest) Rmdir_Empty() {
 	t.Clock.AdvanceTime(time.Second)
 
 	// There should be nothing left in the parent.
-	entries, err = ioutil.ReadDir(path.Join(t.Dir, "foo"))
+	entries, err = fusetesting.ReadDirPicky(path.Join(t.Dir, "foo"))
 
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
@@ -601,7 +601,7 @@ func (t *MemFSTest) Rmdir_Empty() {
 	AssertEq(nil, err)
 
 	// Now the root directory should be empty, too.
-	entries, err = ioutil.ReadDir(t.Dir)
+	entries, err = fusetesting.ReadDirPicky(t.Dir)
 
 	AssertEq(nil, err)
 	ExpectThat(entries, ElementsAre())
@@ -661,12 +661,12 @@ func (t *MemFSTest) Rmdir_OpenedForReading() {
 	// Attempt to read from the directory. This shouldn't see any junk from the
 	// new directory. It should either succeed with an empty result or should
 	// return ENOENT.
-	entries, err := f.Readdir(0)
+	names, err := f.Readdirnames(0)
 
 	if err != nil {
 		ExpectThat(err, Error(HasSubstr("no such file")))
 	} else {
-		ExpectThat(entries, ElementsAre())
+		ExpectThat(names, ElementsAre())
 	}
 }
 

samples/memfs/posix_test.go

@@ -410,11 +410,11 @@ func (t *PosixTest) RmdirWhileOpenedForReading() {
 	// Attempt to read from the directory. This shouldn't see any junk from the
 	// new directory. It should either succeed with an empty result or should
 	// return ENOENT.
-	entries, err := f.Readdir(0)
+	names, err := f.Readdirnames(0)
 
 	if err != nil {
 		ExpectThat(err, Error(HasSubstr("no such file")))
 	} else {
-		ExpectThat(entries, ElementsAre())
+		ExpectThat(names, ElementsAre())
 	}
 }