diff --git a/overlay.go b/overlay.go index 8dab55d4f2bfc65b08fb7b47be9f2b02bffbca84..84410a2a79651f909e1094f3d032d758622e37f0 100644 --- a/overlay.go +++ b/overlay.go @@ -40,13 +40,6 @@ return f.fs.Open(name) } import ( - -// This method will prefer EMBEDDED, because that is the "real" FS for overlay -func (f *FS) ReadDir(name string) ([]fs.DirEntry, error) { - return fs.ReadDir(f.fs, name) -} - -import ( "path" type Option func(*FS) error diff --git a/overlay_test.go b/overlay_test.go index 07ec8d203d4ec7feb418e99987c7f6938d9820e8..2992095d9383a209fd4a734b9914be20dc51c00a 100644 --- a/overlay_test.go +++ b/overlay_test.go @@ -3,7 +3,6 @@ import ( "embed" "io" - "io/fs" "os" "strings" "testing" @@ -60,48 +59,6 @@ t.Logf("fs did not match:\n\tgot: %s\n\texpected: %s\n", string(contents), tc.Expected) t.FailNow() } }) - } -} - -func TestWalk(t *testing.T) { - expected := []string{"test1.txt", "test2.txt"} - - x, err := New("_test/disk", embedded, WithSub("_test/embed"), WithCaching(false)) - if err != nil { - t.Log(err) - t.FailNow() - } - - found := make([]string, 0) - if err := fs.WalkDir(x, ".", func(walkPath string, walkEntry fs.DirEntry, walkErr error) error { - if walkErr != nil { - return walkErr - } - - if walkEntry.IsDir() { - return nil - } - - found = append(found, walkEntry.Name()) - - return nil - }); err != nil { - t.Log(err) - t.FailNow() - } - - for _, e := range expected { - exists := false - for _, f := range found { - if e == f { - exists = true - break - } - } - if !exists { - t.Logf("could not find %s in %s\n", e, found) - t.Fail() - } } }