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

cloudapi: remove a confusing test

Browse source 
This test tested two things:

1) Invalid route - this is already covered by TestUnknownRoute
2) Invalid UUID in the compose status route - this is now covered by
   TestComposeStatusInvalidUUID

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2022-07-18 11:58:35 +02:00 • committed by Ondřej Budai
parent 3e25f5ef76
commit 058edd3d76
2 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
internal/cloudapi/v2/v2_koji_test.go
View file

@ -5,7 +5,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest"
"testing" "testing"
"time" "time"
@ -540,35 +539,6 @@ func TestKojiCompose(t *testing.T) {
} }
} }
func TestKojiRequest(t *testing.T) {
server, _, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2")
defer cancel()
// Make request to an invalid route
req := httptest.NewRequest("GET", "/invalidroute", nil)
rec := httptest.NewRecorder()
handler.ServeHTTP(rec, req)
resp := rec.Result()
var status api.Status
err := json.NewDecoder(resp.Body).Decode(&status)
require.NoError(t, err)
require.Equal(t, http.StatusNotFound, resp.StatusCode)
// Trigger an error 400 code
req = httptest.NewRequest("GET", "/api/image-builder-composer/v2/composes/badid", nil)
rec = httptest.NewRecorder()
handler.ServeHTTP(rec, req)
resp = rec.Result()
err = json.NewDecoder(resp.Body).Decode(&status)
require.NoError(t, err)
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
}
func TestKojiJobTypeValidation(t *testing.T) { func TestKojiJobTypeValidation(t *testing.T) {
server, workers, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false) server, workers, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2") handler := server.Handler("/api/image-builder-composer/v2")

19
internal/cloudapi/v2/v2_test.go
View file

@ -8,9 +8,10 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/osbuild/osbuild-composer/pkg/jobqueue"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/osbuild/osbuild-composer/pkg/jobqueue"
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2" v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
"github.com/osbuild/osbuild-composer/internal/distro/test_distro" "github.com/osbuild/osbuild-composer/internal/distro/test_distro"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue" "github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
@ -718,6 +719,22 @@ func TestComposeStatusFailure(t *testing.T) {
}`, jobId, jobId)) }`, jobId, jobId))
} }
func TestComposeStatusInvalidUUID(t *testing.T) {
srv, _, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/composes/abcdef", ``, http.StatusBadRequest, `
{
"code": "IMAGE-BUILDER-COMPOSER-14",
"details": "",
"href": "/api/image-builder-composer/v2/errors/14",
"id": "14",
"kind": "Error",
"reason": "Invalid format for compose id"
}
`, "operation_id")
}
func TestComposeJobError(t *testing.T) { func TestComposeJobError(t *testing.T) {
srv, wrksrv, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false) srv, wrksrv, _, cancel := newV2Server(t, t.TempDir(), []string{""}, false)
defer cancel() defer cancel()