]> Cypherpunks repositories - gostls13.git/commitdiff
Revert "testing/fstest: test that ReadDirFile on a non-dir fails"
authorJosh Bleecher Snyder <josharian@gmail.com>
Fri, 12 Mar 2021 15:45:18 +0000 (15:45 +0000)
committerJosh Bleecher Snyder <josharian@gmail.com>
Fri, 12 Mar 2021 16:00:02 +0000 (16:00 +0000)
This reverts commit 1853411d8376570295711f9084d494d458822578.

Reason for revert: broke plan 9 builder. fixes #44967

Change-Id: Ib89448d37f7ab8bb05dbd89ce744431d807eb4da
Reviewed-on: https://go-review.googlesource.com/c/go/+/301190
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Trust: Josh Bleecher Snyder <josharian@gmail.com>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>

src/testing/fstest/testfs.go

index 27c603167f298d17edf460eae2ae0f1fa9303260..e0ad60a17b6a152b093fe2043c3a212e94ac9c6f 100644 (file)
@@ -119,9 +119,6 @@ func (t *fsTester) openDir(dir string) fs.ReadDirFile {
                t.errorf("%s: Open: %v", dir, err)
                return nil
        }
-       // It'd be nice to test here that f.Read fails, because f is a directory.
-       // However, FreeBSD supports calling read on a directory.
-       // See https://groups.google.com/g/golang-dev/c/rh8jwxyG1PQ.
        d, ok := f.(fs.ReadDirFile)
        if !ok {
                f.Close()
@@ -517,12 +514,6 @@ func (t *fsTester) checkFile(file string) {
                return
        }
 
-       if dir, ok := f.(fs.ReadDirFile); ok {
-               if _, err := dir.ReadDir(-1); err == nil {
-                       t.errorf("%s: ReadDir of non-dir file should return an error", file)
-               }
-       }
-
        data, err := ioutil.ReadAll(f)
        if err != nil {
                f.Close()