Skip to content

Commit e2017b4

Browse files
kushnaiduliamfallon
kushnaidu
and
liamfallon
authored
Housekeeping activity to update unit tests to use the correct testify components (#958)
Co-authored-by: Liam Fallon <35595825+liamfallon@users.noreply.github.com>
1 parent 3049c64 commit e2017b4

2 files changed

Lines changed: 13 additions & 22 deletions

File tree

‎pkg/registry/porch/packagerevision_approval_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
mockengine "github.com/nephio-project/porch/test/mockery/mocks/porch/pkg/engine"
2727
"github.com/stretchr/testify/assert"
2828
"github.com/stretchr/testify/mock"
29+
"github.com/stretchr/testify/require"
2930
apierrors "k8s.io/apimachinery/pkg/api/errors"
3031
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3132
"k8s.io/apimachinery/pkg/runtime"
@@ -145,7 +146,7 @@ func TestApprovalUpdate(t *testing.T) {
145146
}
146147

147148
result, created, err := approval.Update(ctx, pkgRevName, objInfo, nil, nil, false, &metav1.UpdateOptions{})
148-
assert.NoError(t, err)
149+
require.NoError(t, err)
149150
assert.NotNil(t, result)
150151
assert.False(t, created)
151152
assert.IsType(t, &porchapi.PackageRevision{}, result)
@@ -159,7 +160,6 @@ func TestApprovalUpdate(t *testing.T) {
159160
mockEngine.On("UpdatePackageRevision", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("approval update failed")).Once()
160161

161162
result, created, err = approval.Update(ctx, pkgRevName, objInfo, nil, nil, false, &metav1.UpdateOptions{})
162-
assert.Error(t, err)
163163
assert.Nil(t, result)
164164
assert.False(t, created)
165165
assert.True(t, apierrors.IsInternalError(err))

‎pkg/registry/porch/packagerevision_test.go‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
mockrepo "github.com/nephio-project/porch/test/mockery/mocks/porch/pkg/repository"
3232
"github.com/stretchr/testify/assert"
3333
"github.com/stretchr/testify/mock"
34+
"github.com/stretchr/testify/require"
3435
apierrors "k8s.io/apimachinery/pkg/api/errors"
3536
"k8s.io/apimachinery/pkg/apis/meta/internalversion"
3637
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -149,7 +150,7 @@ func TestList(t *testing.T) {
149150
}, nil).Once()
150151

151152
result, err := packagerevisions.List(context.TODO(), &internalversion.ListOptions{})
152-
assert.NoError(t, err)
153+
require.NoError(t, err)
153154
assert.Equal(t, 1, len(result.(*porchapi.PackageRevisionList).Items))
154155

155156
//=========================================================================================
@@ -173,7 +174,7 @@ func TestList(t *testing.T) {
173174
mockPkgRev.On("KubeObjectName").Return("test-package").Maybe()
174175
mockPkgRev.On("GetPackageRevision", mock.Anything).Return(nil, errors.New("error getting API package revision")).Once()
175176
result, err = packagerevisions.List(context.TODO(), &internalversion.ListOptions{})
176-
assert.NoError(t, err)
177+
require.NoError(t, err)
177178
resultList, isList := result.(*porchapi.PackageRevisionList)
178179
assert.True(t, isList)
179180
assert.Equal(t, 0, len(resultList.Items))
@@ -191,7 +192,7 @@ func TestGet(t *testing.T) {
191192

192193
ctx := request.WithNamespace(context.TODO(), "someDummyNamespace")
193194
result, err := packagerevisions.Get(ctx, pkgRevName, &metav1.GetOptions{})
194-
assert.NoError(t, err)
195+
require.NoError(t, err)
195196
assert.NotNil(t, result)
196197
assert.IsType(t, &porchapi.PackageRevision{}, result)
197198

@@ -201,7 +202,6 @@ func TestGet(t *testing.T) {
201202
mockEngine.On("ListPackageRevisions", mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Once()
202203

203204
result, err = packagerevisions.Get(ctx, pkgRevName, &metav1.GetOptions{})
204-
assert.Error(t, err)
205205
assert.Nil(t, result)
206206
assert.True(t, apierrors.IsNotFound(err))
207207

@@ -240,15 +240,14 @@ func TestCreate(t *testing.T) {
240240
mockEngine.On("CreatePackageRevision", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(packageRevision, nil).Once()
241241

242242
result, err := packagerevisions.Create(ctx, newPkgRev, nil, &metav1.CreateOptions{})
243-
assert.NoError(t, err)
243+
require.NoError(t, err)
244244
assert.NotNil(t, result)
245245
assert.IsType(t, &porchapi.PackageRevision{}, result)
246246

247247
//=========================================================================================
248248

249249
// Missing namespace
250250
result, err = packagerevisions.Create(context.TODO(), newPkgRev, nil, &metav1.CreateOptions{})
251-
assert.Error(t, err)
252251
assert.Nil(t, result)
253252
assert.ErrorContains(t, err, "namespace must be specified")
254253

@@ -257,7 +256,6 @@ func TestCreate(t *testing.T) {
257256
// Wrong object type
258257
wrongObj := &porchapi.PackageRevisionList{}
259258
result, err = packagerevisions.Create(ctx, wrongObj, nil, &metav1.CreateOptions{})
260-
assert.Error(t, err)
261259
assert.Nil(t, result)
262260
assert.ErrorContains(t, err, "expected PackageRevision object")
263261

@@ -271,7 +269,6 @@ func TestCreate(t *testing.T) {
271269
},
272270
}
273271
result, err = packagerevisions.Create(ctx, invalidPkgRev, nil, &metav1.CreateOptions{})
274-
assert.Error(t, err)
275272
assert.Nil(t, result)
276273
assert.ErrorContains(t, err, "spec.repositoryName is required")
277274

@@ -281,7 +278,6 @@ func TestCreate(t *testing.T) {
281278
mockEngine.On("CreatePackageRevision", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("creation failed")).Once()
282279

283280
result, err = packagerevisions.Create(ctx, newPkgRev, nil, &metav1.CreateOptions{})
284-
assert.Error(t, err)
285281
assert.Nil(t, result)
286282
assert.True(t, apierrors.IsInternalError(err))
287283

@@ -359,7 +355,7 @@ info:
359355
mockEngine.On("DeletePackageRevision", mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
360356

361357
result, deleted, err := packagerevisions.Delete(ctx, pkgRevName, nil, &metav1.DeleteOptions{})
362-
assert.NoError(t, err)
358+
require.NoError(t, err)
363359
assert.NotNil(t, result)
364360
assert.True(t, deleted)
365361
assert.IsType(t, &porchapi.PackageRevision{}, result)
@@ -372,7 +368,6 @@ info:
372368
}, nil).Once()
373369

374370
result, deleted, err = packagerevisions.Delete(ctx, pkgRevName, nil, &metav1.DeleteOptions{})
375-
assert.Error(t, err)
376371
assert.Nil(t, result)
377372
assert.False(t, deleted)
378373
assert.True(t, apierrors.IsForbidden(err))
@@ -429,7 +424,7 @@ info:
429424
mockEngine.On("DeletePackageRevision", mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
430425

431426
result, deleted, err = packagerevisions.Delete(ctx, pkgRevName, nil, &metav1.DeleteOptions{})
432-
assert.NoError(t, err)
427+
require.NoError(t, err)
433428
assert.NotNil(t, result)
434429
assert.True(t, deleted)
435430
assert.IsType(t, &porchapi.PackageRevision{}, result)
@@ -438,7 +433,6 @@ info:
438433

439434
// Missing namespace
440435
result, deleted, err = packagerevisions.Delete(context.TODO(), pkgRevName, nil, &metav1.DeleteOptions{})
441-
assert.Error(t, err)
442436
assert.Nil(t, result)
443437
assert.False(t, deleted)
444438
assert.ErrorContains(t, err, "namespace must be specified")
@@ -449,7 +443,7 @@ info:
449443
mockEngine.On("ListPackageRevisions", mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Once()
450444

451445
result, deleted, err = packagerevisions.Delete(ctx, pkgRevName, nil, &metav1.DeleteOptions{})
452-
assert.Error(t, err)
446+
require.Error(t, err)
453447
assert.Nil(t, result)
454448
assert.False(t, deleted)
455449
assert.True(t, apierrors.IsNotFound(err))
@@ -464,7 +458,6 @@ info:
464458
mockEngine.On("DeletePackageRevision", mock.Anything, mock.Anything, mock.Anything).Return(errors.New("deletion failed")).Once()
465459

466460
result, deleted, err = packagerevisions.Delete(ctx, pkgRevName, nil, &metav1.DeleteOptions{})
467-
assert.Error(t, err)
468461
assert.Nil(t, result)
469462
assert.False(t, deleted)
470463
assert.True(t, apierrors.IsInternalError(err))
@@ -480,7 +473,7 @@ func TestWatch(t *testing.T) {
480473
defer cancel()
481474

482475
_, err := packagerevisions.Watch(ctx, &internalversion.ListOptions{})
483-
assert.NoError(t, err)
476+
require.NoError(t, err)
484477

485478
//=========================================================================================
486479

@@ -832,7 +825,7 @@ func TestCheckIfUpstreamIsReferenced(t *testing.T) {
832825
if tc.expectErr {
833826
assert.Error(t, err)
834827
} else {
835-
assert.NoError(t, err)
828+
require.NoError(t, err)
836829
}
837830
})
838831
}
@@ -886,7 +879,7 @@ func TestUpdate(t *testing.T) {
886879
}
887880

888881
result, created, err := packagerevisions.Update(ctx, pkgRevName, objInfo, nil, nil, false, &metav1.UpdateOptions{})
889-
assert.NoError(t, err)
882+
require.NoError(t, err)
890883
assert.NotNil(t, result)
891884
assert.False(t, created)
892885
assert.IsType(t, &porchapi.PackageRevision{}, result)
@@ -900,7 +893,6 @@ func TestUpdate(t *testing.T) {
900893
mockEngine.On("UpdatePackageRevision", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("update failed")).Once()
901894

902895
result, created, err = packagerevisions.Update(ctx, pkgRevName, objInfo, nil, nil, false, &metav1.UpdateOptions{})
903-
assert.Error(t, err)
904896
assert.Nil(t, result)
905897
assert.False(t, created)
906898
assert.True(t, apierrors.IsInternalError(err))
@@ -924,7 +916,6 @@ func TestUpdate(t *testing.T) {
924916
mockEngine.On("UpdatePackageRevision", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, apierrors.NewConflict(porchapi.Resource("packagerevisions"), pkgRevName, fmt.Errorf("the object has been modified; please apply your changes to the latest version and try again"))).Once()
925917

926918
result, created, err = packagerevisions.Update(ctx, pkgRevName, objInfo, nil, nil, false, &metav1.UpdateOptions{})
927-
assert.Error(t, err)
928919
assert.Nil(t, result)
929920
assert.False(t, created)
930921
assert.True(t, apierrors.IsInternalError(err))

0 commit comments

Comments
 (0)