Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return error in Readdir on regular mem file #170

Merged
merged 1 commit into from
May 31, 2018
Merged

Return error in Readdir on regular mem file #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions afero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,25 @@ func TestReaddir(t *testing.T) {
}
}

// https://github.com/spf13/afero/issues/169
func TestReaddirRegularFile(t *testing.T) {
defer removeAllTestFiles(t)
for _, fs := range Fss {
f := tmpFile(fs)
defer f.Close()

_, err := f.Readdirnames(-1)
if err == nil {
t.Fatal("Expected error")
}

_, err = f.Readdir(-1)
if err == nil {
t.Fatal("Expected error")
}
}
}

type myFileInfo []os.FileInfo

func (m myFileInfo) String() string {
Expand Down
3 changes: 3 additions & 0 deletions mem/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ func (f *File) Sync() error {
}

func (f *File) Readdir(count int) (res []os.FileInfo, err error) {
if !f.fileData.dir {
return nil, &os.PathError{Op: "readdir", Path: f.fileData.name, Err: errors.New("not a dir")}
}
var outLength int64

f.fileData.Lock()
Expand Down