Skip to content

Commit

Permalink
chore: Remove BadObjStore unit tests (no longer applicable)
Browse files Browse the repository at this point in the history
Signed-off-by: Giulio Frasca <gfrasca@redhat.com>
  • Loading branch information
gmfrasca committed Aug 6, 2024
1 parent 4ca7eb1 commit 1b12d83
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 87 deletions.
47 changes: 0 additions & 47 deletions backend/src/apiserver/resource/resource_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,24 +388,6 @@ func TestCreatePipeline(t *testing.T) {
name: "complex",
model: createPipeline("complex", "", "user1"),
},
{
msg: "BadObjectStore",
badObjectStore: true,
template: testWorkflow.ToStringForStore(),
errorCode: codes.Internal,
errorMsg: "bad object store",
model: createPipeline("BadOS", "", "user1"),
// We previously verified that the failed pipeline version
// in DB is in status PipelineVersionCreating by faking
// the UUID generator, so that we know the created version
// UUID in advance.
// We cannot verify it using public APIs,
// because the API does not expose them unless we know its UUID, but we
// cannot know its UUID when create version request failed.
// TODO: do we really need to verify this status? or should
// the create version request return a UUID when the
// pipeline version fails in PipelineVersionCreating state.
},
{
msg: "InvalidTemplate",
template: "I am invalid yaml",
Expand Down Expand Up @@ -536,23 +518,6 @@ func TestCreatePipelineVersion(t *testing.T) {
PipelineSpec: complexPipeline,
},
},
{
msg: "BadObjectStore",
badObjectStore: true,
template: testWorkflow.ToStringForStore(),
errorCode: codes.Internal,
errorMsg: "bad object store",
// We previously verified that the failed pipeline version
// in DB is in status PipelineVersionCreating by faking
// the UUID generator, so that we know the created version
// UUID in advance.
// We cannot verify it using public APIs,
// because the API does not expose them unless we know its UUID, but we
// cannot know its UUID when create version request failed.
// TODO: do we really need to verify this status? or should
// the create version request return a UUID when the
// pipeline version fails in PipelineVersionCreating state.
},
{
msg: "InvalidTemplate",
template: "I am invalid yaml",
Expand Down Expand Up @@ -1524,18 +1489,6 @@ func TestDeletePipelineVersion_FileError(t *testing.T) {
assert.True(t, ok)
pipelineStore.SetUUIDGenerator(util.NewFakeUUIDGeneratorOrFatal(FakeUUIDOne, nil))
manager.CreatePipelineVersion(pv)

// Switch to a bad object store
manager.objectStore = &FakeBadObjectStore{}

// Delete the above pipeline_version.
err = manager.DeletePipelineVersion(FakeUUIDOne)
assert.NotNil(t, err)

// Verify the version in deleting status.
version, err := manager.pipelineStore.GetPipelineVersionWithStatus(FakeUUIDOne, model.PipelineVersionDeleting)
assert.Nil(t, err)
assert.NotNil(t, version)
}

// Tests DeletePipeline
Expand Down
41 changes: 1 addition & 40 deletions backend/src/apiserver/server/pipeline_upload_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,6 @@ func TestUploadPipeline(t *testing.T) {
assert.Equal(t, "123e4567-e89b-12d3-a456-426655440000", parsedResponse.PipelineID)
}

// Verify stored in object store
objStore := clientManager.ObjectStore()
template, err := objStore.GetFile(objStore.GetPipelineKey(DefaultFakeUUID))
assert.Nil(t, err)
assert.NotNil(t, template)

opts, err := list.NewOptions(&model.Pipeline{}, 2, "", nil)
assert.Nil(t, err)

Expand Down Expand Up @@ -159,11 +153,6 @@ func TestUploadPipeline(t *testing.T) {
assert.Equal(t, 200, response.Code)
assert.Contains(t, response.Body.String(), `"created_at":"1970-01-01T00:00:03Z"`)

// Verify stored in object store
objStore = clientManager.ObjectStore()
template, err = objStore.GetFile(objStore.GetPipelineKey(fakeVersionUUID))
assert.Nil(t, err)
assert.NotNil(t, template)
opts, err = list.NewOptions(&model.PipelineVersion{}, 2, "", nil)
assert.Nil(t, err)

Expand Down Expand Up @@ -256,7 +245,7 @@ func TestUploadPipelineV2_NameValidation(t *testing.T) {
}
for _, test := range tt {
t.Run(test.name, func(t *testing.T) {
clientManager, server := setupClientManagerAndServer()
_, server := setupClientManagerAndServer()
bytesBuffer, writer := setupWriter("")
setWriterWithBuffer("uploadfile", "hello-world.yaml", string(test.spec), writer)
response := uploadPipeline("/apis/v2beta1/pipelines/upload",
Expand Down Expand Up @@ -284,12 +273,6 @@ func TestUploadPipelineV2_NameValidation(t *testing.T) {
// Verify v1 API returns v1 object while v2 API returns v2 object.
assert.Equal(t, "", parsedResponse.ID)
assert.Equal(t, "123e4567-e89b-12d3-a456-426655440000", parsedResponse.PipelineID)

// Verify stored in object store
objStore := clientManager.ObjectStore()
template, err := objStore.GetFile(objStore.GetPipelineKey(DefaultFakeUUID))
assert.Nil(t, err)
assert.NotNil(t, template)
}
})
}
Expand All @@ -306,12 +289,6 @@ func TestUploadPipeline_Tarball(t *testing.T) {
// Verify time format is RFC3339
assert.Contains(t, response.Body.String(), `"created_at":"1970-01-01T00:00:01Z"`)

// Verify stored in object store
objStore := clientManager.ObjectStore()
template, err := objStore.GetFile(objStore.GetPipelineKey(DefaultFakeUUID))
assert.Nil(t, err)
assert.NotNil(t, template)

opts, err := list.NewOptions(&model.Pipeline{}, 2, "", nil)
assert.Nil(t, err)
// Verify metadata in db
Expand Down Expand Up @@ -359,11 +336,6 @@ func TestUploadPipeline_Tarball(t *testing.T) {
assert.Equal(t, 200, response.Code)
assert.Contains(t, response.Body.String(), `"created_at":"1970-01-01T00:00:03Z"`)

// Verify stored in object store
objStore = clientManager.ObjectStore()
template, err = objStore.GetFile(objStore.GetPipelineKey(fakeVersionUUID))
assert.Nil(t, err)
assert.NotNil(t, template)
opts, err = list.NewOptions(&model.PipelineVersion{}, 2, "", nil)
assert.Nil(t, err)
// Verify metadata in db
Expand Down Expand Up @@ -414,12 +386,6 @@ func TestUploadPipeline_SpecifyFileName(t *testing.T) {
bytes.NewReader(bytesBuffer.Bytes()), writer, server.UploadPipeline)
assert.Equal(t, 200, response.Code)

// Verify stored in object store
objStore := clientManager.ObjectStore()
template, err := objStore.GetFile(objStore.GetPipelineKey(DefaultFakeUUID))
assert.Nil(t, err)
assert.NotNil(t, template)

opts, err := list.NewOptions(&model.Pipeline{}, 2, "", nil)
assert.Nil(t, err)
// Verify metadata in db
Expand Down Expand Up @@ -467,11 +433,6 @@ func TestUploadPipeline_SpecifyFileDescription(t *testing.T) {
bytes.NewReader(bytesBuffer.Bytes()), writer, server.UploadPipeline)
assert.Equal(t, 200, response.Code)

// Verify stored in object store
objStore := clientManager.ObjectStore()
template, err := objStore.GetFile(objStore.GetPipelineKey(DefaultFakeUUID))
assert.Nil(t, err)
assert.NotNil(t, template)
opts, err := list.NewOptions(&model.Pipeline{}, 2, "", nil)
assert.Nil(t, err)

Expand Down

0 comments on commit 1b12d83

Please sign in to comment.