From 76714d53f808109d2f0eae924da46632b97ab736 Mon Sep 17 00:00:00 2001 From: peusebiu Date: Wed, 19 Oct 2022 19:26:46 +0300 Subject: [PATCH] fix(tests): consolidate routes tests (#892) Signed-off-by: Petu Eusebiu --- pkg/api/routes_test.go | 9 +++++++++ pkg/test/common_test.go | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkg/api/routes_test.go b/pkg/api/routes_test.go index fca43c12..4634e686 100644 --- a/pkg/api/routes_test.go +++ b/pkg/api/routes_test.go @@ -796,6 +796,9 @@ func TestRoutes(t *testing.T) { PutBlobChunkFn: func(repo, uuid string, from, to int64, body io.Reader) (int64, error) { return 100, ErrUnexpectedError }, + DeleteBlobUploadFn: func(repo, uuid string) error { + return ErrUnexpectedError + }, }, ) So(status, ShouldEqual, http.StatusInternalServerError) @@ -941,6 +944,9 @@ func TestRoutes(t *testing.T) { PutBlobChunkFn: func(repo, uuid string, from, to int64, body io.Reader) (int64, error) { return 0, ErrUnexpectedError }, + DeleteBlobUploadFn: func(repo, uuid string) error { + return ErrUnexpectedError + }, }, ) So(status, ShouldEqual, http.StatusInternalServerError) @@ -1041,6 +1047,9 @@ func TestRoutes(t *testing.T) { FinishBlobUploadFn: func(repo, uuid string, body io.Reader, digest string) error { return ErrUnexpectedError }, + DeleteBlobUploadFn: func(repo, uuid string) error { + return ErrUnexpectedError + }, }, ) So(status, ShouldEqual, http.StatusInternalServerError) diff --git a/pkg/test/common_test.go b/pkg/test/common_test.go index 9915143a..3f00ae50 100644 --- a/pkg/test/common_test.go +++ b/pkg/test/common_test.go @@ -9,6 +9,7 @@ import ( "os" "path" "testing" + "time" "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" @@ -140,6 +141,20 @@ func TestGetImageComponents(t *testing.T) { }) } +func TestWaitTillTrivyDBDownloadStarted(t *testing.T) { + Convey("finishes successfully", t, func() { + tempDir := t.TempDir() + go func() { + test.WaitTillTrivyDBDownloadStarted(tempDir) + }() + + time.Sleep(test.SleepTime) + + _, err := os.Create(path.Join(tempDir, "trivy.db")) + So(err, ShouldBeNil) + }) +} + func TestUploadImage(t *testing.T) { Convey("Post request results in an error", t, func() { port := test.GetFreePort()