From 48c68cfa7f18992b26765c7b67c52c11687ad74a Mon Sep 17 00:00:00 2001 From: Nick White Date: Tue, 17 Aug 2021 13:18:04 +0100 Subject: pipeline: use regular storage for tests, rather than a separate one --- internal/pipeline/put.go | 6 +++--- internal/pipeline/put_test.go | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'internal/pipeline') diff --git a/internal/pipeline/put.go b/internal/pipeline/put.go index 26d581c..8cbecac 100644 --- a/internal/pipeline/put.go +++ b/internal/pipeline/put.go @@ -78,9 +78,9 @@ func DetectQueueType(dir string, conn Queuer) string { } // UploadImages uploads all files (except those which start with a ".") -// from a directory (recursively) into a given storage id, prefixed with +// from a directory (recursively) into conn.WIPStorageId(), prefixed with // the given bookname and a slash -func UploadImages(dir string, bookname string, conn Uploader, storageId string) error { +func UploadImages(dir string, bookname string, conn Uploader) error { walker := make(fileWalk) go func() { _ = filepath.Walk(dir, walker.Walk) @@ -89,7 +89,7 @@ func UploadImages(dir string, bookname string, conn Uploader, storageId string) for path := range walker { name := filepath.Base(path) - err := conn.Upload(storageId, bookname + "/" + name, path) + err := conn.Upload(conn.WIPStorageId(), bookname + "/" + name, path) if err != nil { return fmt.Errorf("Failed to upload %s: %v", path, err) } diff --git a/internal/pipeline/put_test.go b/internal/pipeline/put_test.go index 912a4ef..5fb5b43 100644 --- a/internal/pipeline/put_test.go +++ b/internal/pipeline/put_test.go @@ -92,18 +92,13 @@ func Test_UploadImages(t *testing.T) { if err != nil { t.Fatalf("Could not initialise %s connection: %v\nLog: %s", conn.name, err, slog.log) } - err = conn.c.TestInit() - if err != nil { - t.Fatalf("Failed in test initialisalisation for %s: %v\nLog: %s", conn.name, err, slog.log) - } slog.log = "" - err = UploadImages("testdata/good", "good", conn.c, conn.c.TestStorageId()) + err = UploadImages("testdata/good", "good", conn.c) if err != nil { t.Fatalf("Error in UploadImages for %s: %v\nLog: %s", conn.name, err, slog.log) } - // TODO: decide on whether to use TestStorageId or just the WIPStorageId as with other tests, and align other tests to this if needed // TODO: download all files and test that they match // TODO: remove test files from conn storage }) -- cgit v1.2.1-24-ge1ad