From 90e15da0326aaa4be5ae1133c97c8b74b8878097 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Mon, 11 Jan 2021 18:35:52 +0100 Subject: [PATCH] kojiapi/test: use the worker of the fixture No need to create a second one. --- internal/kojiapi/server_test.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/internal/kojiapi/server_test.go b/internal/kojiapi/server_test.go index 76c1bf99d..1f5ac9c07 100644 --- a/internal/kojiapi/server_test.go +++ b/internal/kojiapi/server_test.go @@ -12,7 +12,6 @@ import ( "sync" "testing" - "github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue" "github.com/osbuild/osbuild-composer/internal/kojiapi" "github.com/osbuild/osbuild-composer/internal/kojiapi/api" distro_mock "github.com/osbuild/osbuild-composer/internal/mocks/distro" @@ -24,7 +23,7 @@ import ( ) func newTestKojiServer(t *testing.T, dir string) (*kojiapi.Server, *worker.Server) { - rpm_fixture := rpmmd_mock.BaseFixture() + rpm_fixture := rpmmd_mock.BaseFixture(dir) rpm := rpmmd_mock.NewRPMMDMock(rpm_fixture) require.NotNil(t, rpm) @@ -32,16 +31,10 @@ func newTestKojiServer(t *testing.T, dir string) (*kojiapi.Server, *worker.Serve require.NoError(t, err) require.NotNil(t, distros) - queue, err := fsjobqueue.New(dir) - require.NoError(t, err) - - workerServer := worker.NewServer(nil, queue, "") - require.NotNil(t, workerServer) - - kojiServer := kojiapi.NewServer(nil, workerServer, rpm, distros) + kojiServer := kojiapi.NewServer(nil, rpm_fixture.Workers, rpm, distros) require.NotNil(t, kojiServer) - return kojiServer, workerServer + return kojiServer, rpm_fixture.Workers } func TestStatus(t *testing.T) {