From 38ea627cde75ebdef2cdb77814c57c52182e60e9 Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Fri, 18 Oct 2019 12:27:58 -0400 Subject: [PATCH] ya betta pawn it --- pkging/mem/embed_test.go | 12 ++++-------- pkging/pkgtest/file.go | 3 ++- pkging/pkgtest/suite.go | 2 ++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkging/mem/embed_test.go b/pkging/mem/embed_test.go index 746bb62..04cecd9 100644 --- a/pkging/mem/embed_test.go +++ b/pkging/mem/embed_test.go @@ -114,10 +114,8 @@ var pubWalk = []string{ "app:/", "app:/public", "app:/public/images", - "app:/public/images/mark-small.png", - "app:/public/images/mark.png", - "app:/public/images/mark_250px.png", - "app:/public/images/mark_400px.png", + "app:/public/images/img1.png", + "app:/public/images/img2.png", "app:/public/index.html", } @@ -127,10 +125,8 @@ var rootWalk = []string{ "app:/main.go", "app:/public", "app:/public/images", - "app:/public/images/mark-small.png", - "app:/public/images/mark.png", - "app:/public/images/mark_250px.png", - "app:/public/images/mark_400px.png", + "app:/public/images/img1.png", + "app:/public/images/img2.png", "app:/public/index.html", "app:/templates", "app:/templates/a.txt", diff --git a/pkging/pkgtest/file.go b/pkging/pkgtest/file.go index 9954a8b..81e018f 100644 --- a/pkging/pkgtest/file.go +++ b/pkging/pkgtest/file.go @@ -92,13 +92,14 @@ func (s Suite) Test_File_Readdir(t *testing.T) { infos, err = dir.Readdir(-1) r.NoError(err) - r.Len(infos, 1) + r.Len(infos, 2) sort.Slice(infos, func(i, j int) bool { return infos[i].Name() < infos[j].Name() }) r.Equal("img1.png", infos[0].Name()) + r.Equal("img2.png", infos[1].Name()) }) } diff --git a/pkging/pkgtest/suite.go b/pkging/pkgtest/suite.go index dcba20c..e1ee425 100644 --- a/pkging/pkgtest/suite.go +++ b/pkging/pkgtest/suite.go @@ -474,10 +474,12 @@ func (s Suite) Test_Walk(t *testing.T) { exp := []string{ "app:/", + "app:/go.mod", "app:/main.go", "app:/public", "app:/public/images", "app:/public/images/img1.png", + "app:/public/images/img2.png", "app:/public/index.html", "app:/templates", "app:/templates/a.txt",