working for a living

This commit is contained in:
Mark Bates 2019-09-21 14:05:59 -04:00
parent 60d46437f3
commit 88c40da8a1
2 changed files with 46 additions and 3 deletions

View File

@ -174,6 +174,10 @@ func (f *File) Readdir(count int) ([]os.FileInfo, error) {
return io.EOF return io.EOF
} }
if root == path {
return nil
}
pt, err := f.pkging.Parse(path) pt, err := f.pkging.Parse(path)
if err != nil { if err != nil {
return err return err

View File

@ -2,6 +2,7 @@ package pkgtest
import ( import (
"path/filepath" "path/filepath"
"sort"
"testing" "testing"
"github.com/markbates/pkger/pkging/pkgutil" "github.com/markbates/pkger/pkging/pkgutil"
@ -48,9 +49,47 @@ func (s Suite) Test_File_Info(t *testing.T) {
// panic("not implemented") // panic("not implemented")
// } // }
// //
// func (s Suite) Test_File_Readdir(t *testing.T) { func (s Suite) Test_File_Readdir(t *testing.T) {
// panic("not implemented") r := require.New(t)
// }
pkg, err := s.Make()
r.NoError(err)
cur, err := pkg.Current()
r.NoError(err)
ip := cur.ImportPath
table := []struct {
in string
}{
{in: ":/public"},
{in: ip + ":/public"},
}
r.NoError(s.LoadFolder(pkg))
for _, tt := range table {
s.Run(t, tt.in, func(st *testing.T) {
r := require.New(st)
dir, err := pkg.Open(tt.in)
r.NoError(err)
defer dir.Close()
infos, err := dir.Readdir(-1)
r.NoError(err)
r.Len(infos, 2)
sort.Slice(infos, func(i, j int) bool {
return infos[i].Name() < infos[j].Name()
})
r.Equal("images", infos[0].Name())
r.Equal("index.html", infos[1].Name())
})
}
}
// //
// func (s Suite) Test_File_Seek(t *testing.T) { // func (s Suite) Test_File_Seek(t *testing.T) {
// panic("not implemented") // panic("not implemented")