particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kojiapi/test: use the worker of the fixture

Browse source 
No need to create a second one.
This commit is contained in:
Lars Karlitski 2021-01-11 18:35:52 +01:00 • committed by Ondřej Budai
parent d9f09c66f2
commit 90e15da032
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/kojiapi/server_test.go
View file

@ -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) {