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

Tests: remove fedoratest and replace it with test_distro

Browse source 
fedoratest was yet another dummy distribution used by unit tests. After
the rework of test_distro, there is no reason to not use it as the only
distro implementation for testing purposes.

Remove fedoratest distro and replace it with test_distro in all affected
tests.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-05-05 11:30:00 +02:00 • committed by Ondřej Budai
parent e5dd45b71c
commit f7f064274a
11 changed files with 151 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

59
internal/worker/server_test.go
View file

@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/distro/fedoratest"
"github.com/osbuild/osbuild-composer/internal/distro/test_distro"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
"github.com/osbuild/osbuild-composer/internal/test"
"github.com/osbuild/osbuild-composer/internal/worker"
@ -74,18 +74,18 @@ func TestCreate(t *testing.T) {
require.NoError(t, err)
defer os.RemoveAll(tempdir)
distroStruct := fedoratest.New()
arch, err := distroStruct.GetArch("x86_64")
distroStruct := test_distro.New()
arch, err := distroStruct.GetArch(test_distro.TestArchName)
if err != nil {
t.Fatalf("error getting arch from distro")
t.Fatalf("error getting arch from distro: %v", err)
}
imageType, err := arch.GetImageType("qcow2")
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
if err != nil {
t.Fatalf("error getting image type from arch")
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest")
t.Fatalf("error creating osbuild manifest: %v", err)
}
server := newTestServer(t, tempdir)
handler := server.Handler()
@ -93,7 +93,8 @@ func TestCreate(t *testing.T) {
_, err = server.EnqueueOSBuild(arch.Name(), &worker.OSBuildJob{Manifest: manifest})
require.NoError(t, err)
test.TestRoute(t, handler, false, "POST", "/api/worker/v1/jobs", `{"types":["osbuild"],"arch":"x86_64"}`, http.StatusCreated,
test.TestRoute(t, handler, false, "POST", "/api/worker/v1/jobs",
fmt.Sprintf(`{"types":["osbuild"],"arch":"%s"}`, test_distro.TestArchName), http.StatusCreated,
`{"type":"osbuild","args":{"manifest":{"pipeline":{},"sources":{}}}}`, "id", "location", "artifact_location")
}
@ -102,18 +103,18 @@ func TestCancel(t *testing.T) {
require.NoError(t, err)
defer os.RemoveAll(tempdir)
distroStruct := fedoratest.New()
arch, err := distroStruct.GetArch("x86_64")
distroStruct := test_distro.New()
arch, err := distroStruct.GetArch(test_distro.TestArchName)
if err != nil {
t.Fatalf("error getting arch from distro")
t.Fatalf("error getting arch from distro: %v", err)
}
imageType, err := arch.GetImageType("qcow2")
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
if err != nil {
t.Fatalf("error getting image type from arch")
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest")
t.Fatalf("error creating osbuild manifest: %v", err)
}
server := newTestServer(t, tempdir)
handler := server.Handler()
@ -143,18 +144,18 @@ func TestUpdate(t *testing.T) {
require.NoError(t, err)
defer os.RemoveAll(tempdir)
distroStruct := fedoratest.New()
arch, err := distroStruct.GetArch("x86_64")
distroStruct := test_distro.New()
arch, err := distroStruct.GetArch(test_distro.TestArchName)
if err != nil {
t.Fatalf("error getting arch from distro")
t.Fatalf("error getting arch from distro: %v", err)
}
imageType, err := arch.GetImageType("qcow2")
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
if err != nil {
t.Fatalf("error getting image type from arch")
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest")
t.Fatalf("error creating osbuild manifest: %v", err)
}
server := newTestServer(t, tempdir)
handler := server.Handler()
@ -174,10 +175,10 @@ func TestUpdate(t *testing.T) {
}
func TestArgs(t *testing.T) {
distroStruct := fedoratest.New()
arch, err := distroStruct.GetArch("x86_64")
distroStruct := test_distro.New()
arch, err := distroStruct.GetArch(test_distro.TestArchName)
require.NoError(t, err)
imageType, err := arch.GetImageType("qcow2")
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
require.NoError(t, err)
manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, 0)
require.NoError(t, err)
@ -212,18 +213,18 @@ func TestUpload(t *testing.T) {
require.NoError(t, err)
defer os.RemoveAll(tempdir)
distroStruct := fedoratest.New()
arch, err := distroStruct.GetArch("x86_64")
distroStruct := test_distro.New()
arch, err := distroStruct.GetArch(test_distro.TestArchName)
if err != nil {
t.Fatalf("error getting arch from distro")
t.Fatalf("error getting arch from distro: %v", err)
}
imageType, err := arch.GetImageType("qcow2")
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
if err != nil {
t.Fatalf("error getting image type from arch")
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest")
t.Fatalf("error creating osbuild manifest: %v", err)
}
server := newTestServer(t, tempdir)
handler := server.Handler()