From 4a9812be2e4ad24d525bee4b2a4db41deb9e55f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Wed, 23 Feb 2022 21:02:10 +0100 Subject: [PATCH] cloudapi/test: add option to specify depsolve channels to test server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondřej Budai --- internal/cloudapi/v2/v2_koji_test.go | 6 +++--- internal/cloudapi/v2/v2_test.go | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/cloudapi/v2/v2_koji_test.go b/internal/cloudapi/v2/v2_koji_test.go index f1ab0ccf2..11d05a48e 100644 --- a/internal/cloudapi/v2/v2_koji_test.go +++ b/internal/cloudapi/v2/v2_koji_test.go @@ -31,7 +31,7 @@ func TestKojiCompose(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - kojiServer, workerServer, cancel := newV2Server(t, dir) + kojiServer, workerServer, cancel := newV2Server(t, dir, []string{""}) handler := kojiServer.Handler("/api/image-builder-composer/v2") workerHandler := workerServer.Handler() defer cancel() @@ -464,7 +464,7 @@ func TestKojiRequest(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - server, _, cancel := newV2Server(t, dir) + server, _, cancel := newV2Server(t, dir, []string{""}) handler := server.Handler("/api/image-builder-composer/v2") defer cancel() @@ -496,7 +496,7 @@ func TestKojiJobTypeValidation(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - server, workers, cancel := newV2Server(t, dir) + server, workers, cancel := newV2Server(t, dir, []string{""}) handler := server.Handler("/api/image-builder-composer/v2") defer cancel() diff --git a/internal/cloudapi/v2/v2_test.go b/internal/cloudapi/v2/v2_test.go index 765b9eaca..e45ef1b8b 100644 --- a/internal/cloudapi/v2/v2_test.go +++ b/internal/cloudapi/v2/v2_test.go @@ -22,7 +22,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/worker/clienterrors" ) -func newV2Server(t *testing.T, dir string) (*v2.Server, *worker.Server, context.CancelFunc) { +func newV2Server(t *testing.T, dir string, depsolveChannels []string) (*v2.Server, *worker.Server, context.CancelFunc) { q, err := fsjobqueue.New(dir) require.NoError(t, err) workerServer := worker.NewServer(nil, q, worker.Config{BasePath: "/api/worker/v1", TenantProviderFields: []string{"rh-org-id"}}) @@ -42,7 +42,7 @@ func newV2Server(t *testing.T, dir string) (*v2.Server, *worker.Server, context. depsolveContext, cancel := context.WithCancel(context.Background()) go func() { for { - _, token, _, _, _, err := workerServer.RequestJob(context.Background(), test_distro.TestDistroName, []string{"depsolve"}, []string{""}) + _, token, _, _, _, err := workerServer.RequestJob(context.Background(), test_distro.TestDistroName, []string{"depsolve"}, depsolveChannels) if err != nil { continue } @@ -69,7 +69,7 @@ func TestUnknownRoute(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/badroute", ``, http.StatusNotFound, ` @@ -86,7 +86,7 @@ func TestGetError(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors/4", ``, http.StatusOK, ` @@ -112,7 +112,7 @@ func TestGetErrorList(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors?page=3&size=1", ``, http.StatusOK, ` @@ -134,7 +134,7 @@ func TestCompose(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() // create two ostree repos, one to serve the default test_distro ref (for fallback tests) and one to serve a custom ref @@ -555,7 +555,7 @@ func TestComposeStatusSuccess(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, wrksrv, cancel := newV2Server(t, dir) + srv, wrksrv, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` @@ -627,7 +627,7 @@ func TestComposeStatusFailure(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, wrksrv, cancel := newV2Server(t, dir) + srv, wrksrv, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` @@ -679,7 +679,7 @@ func TestComposeLegacyError(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, wrksrv, cancel := newV2Server(t, dir) + srv, wrksrv, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` @@ -734,7 +734,7 @@ func TestComposeJobError(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, wrksrv, cancel := newV2Server(t, dir) + srv, wrksrv, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` @@ -792,7 +792,7 @@ func TestComposeCustomizations(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` @@ -841,7 +841,7 @@ func TestImageTypes(t *testing.T) { dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") require.NoError(t, err) defer os.RemoveAll(dir) - srv, _, cancel := newV2Server(t, dir) + srv, _, cancel := newV2Server(t, dir, []string{""}) defer cancel() test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`