mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-10-01 12:15:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix require-error rule from testifylint

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-06-23 15:39:54 +00:00
parent 3024e6223e
commit 07ea14962c
99 changed files with 483 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/repository/config/config_test.go
+2 -1
View File
@@ -21,6 +21,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
)
@@ -252,7 +253,7 @@ func TestGetRepoIdentifier(t *testing.T) {
if tc.expectedErr == "" {
assert.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr)
require.EqualError(t, err, tc.expectedErr)
assert.Empty(t, id)
}
})
pkg/repository/ensurer_test.go
+5 -4
View File
@@ -22,6 +22,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -128,9 +129,9 @@ func TestEnsureRepo(t *testing.T) {
repo, err := ensurer.EnsureRepo(context.Background(), velerov1.DefaultNamespace, test.namespace, test.bsl, test.repositoryType)
if err != nil {
assert.EqualError(t, err, test.err)
require.EqualError(t, err, test.err)
} else {
assert.NoError(t, err)
require.NoError(t, err)
}
assert.Equal(t, test.expectedRepo, repo)
@@ -252,9 +253,9 @@ func TestCreateBackupRepositoryAndWait(t *testing.T) {
RepositoryType: test.repositoryType,
})
if err != nil {
assert.EqualError(t, err, test.err)
require.EqualError(t, err, test.err)
} else {
assert.NoError(t, err)
require.NoError(t, err)
}
assert.Equal(t, test.expectedRepo, repo)
pkg/repository/maintenance/maintenance_test.go
+14 -14
View File
@@ -117,12 +117,12 @@ func TestDeleteOldJobs(t *testing.T) {
// Call the function
err := DeleteOldJobs(cli, repo, keep)
assert.NoError(t, err)
require.NoError(t, err)
// Get the remaining jobs
jobList := &batchv1.JobList{}
err = cli.List(context.TODO(), jobList, client.MatchingLabels(map[string]string{RepositoryNameLabel: repo}))
assert.NoError(t, err)
require.NoError(t, err)
// We expect the number of jobs to be equal to 'keep'
assert.Len(t, jobList.Items, keep)
@@ -255,9 +255,9 @@ func TestWaitForJobComplete(t *testing.T) {
// Check if the error matches the expectation
if tc.expectError {
assert.Error(t, err)
require.Error(t, err)
} else {
assert.NoError(t, err)
require.NoError(t, err)
}
assert.LessOrEqual(t, len(buffer), tc.expectedLogs)
@@ -288,14 +288,14 @@ func TestGetResultFromJob(t *testing.T) {
// test an error should be returned
result, err := getResultFromJob(cli, job)
assert.EqualError(t, err, "no pod found for job test-job")
require.EqualError(t, err, "no pod found for job test-job")
assert.Empty(t, result)
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
// test an error should be returned
result, err = getResultFromJob(cli, job)
assert.EqualError(t, err, "no container statuses found for job test-job")
require.EqualError(t, err, "no container statuses found for job test-job")
assert.Empty(t, result)
// Set a non-terminated container status to the pod
@@ -310,7 +310,7 @@ func TestGetResultFromJob(t *testing.T) {
// Test an error should be returned
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
result, err = getResultFromJob(cli, job)
assert.EqualError(t, err, "container for job test-job is not terminated")
require.EqualError(t, err, "container for job test-job is not terminated")
assert.Empty(t, result)
// Set a terminated container status to the pod
@@ -327,7 +327,7 @@ func TestGetResultFromJob(t *testing.T) {
// This call should return the termination message with no error
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
result, err = getResultFromJob(cli, job)
assert.NoError(t, err)
require.NoError(t, err)
assert.Empty(t, result)
// Set a terminated container status with invalidate message to the pod
@@ -345,7 +345,7 @@ func TestGetResultFromJob(t *testing.T) {
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
result, err = getResultFromJob(cli, job)
assert.EqualError(t, err, "error to locate repo maintenance error indicator from termination message")
require.EqualError(t, err, "error to locate repo maintenance error indicator from termination message")
assert.Empty(t, result)
// Set a terminated container status with empty maintenance error to the pod
@@ -363,7 +363,7 @@ func TestGetResultFromJob(t *testing.T) {
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
result, err = getResultFromJob(cli, job)
assert.EqualError(t, err, "nothing after repo maintenance error indicator in termination message")
require.EqualError(t, err, "nothing after repo maintenance error indicator in termination message")
assert.Empty(t, result)
// Set a terminated container status with maintenance error to the pod
@@ -381,7 +381,7 @@ func TestGetResultFromJob(t *testing.T) {
cli = fake.NewClientBuilder().WithObjects(job, pod).Build()
result, err = getResultFromJob(cli, job)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "fake-error", result)
}
@@ -843,7 +843,7 @@ func TestWaitAllJobsComplete(t *testing.T) {
history, err := WaitAllJobsComplete(test.ctx, fakeClient, repo, 3, velerotest.NewLogger())
if test.expectedError != "" {
assert.EqualError(t, err, test.expectedError)
require.EqualError(t, err, test.expectedError)
} else {
require.NoError(t, err)
}
@@ -1061,10 +1061,10 @@ func TestBuildJob(t *testing.T) {
// Check the error
if tc.expectedError {
assert.Error(t, err)
require.Error(t, err)
assert.Nil(t, job)
} else {
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, job)
assert.Contains(t, job.Name, tc.expectedJobName)
assert.Equal(t, param.BackupRepo.Namespace, job.Namespace)
pkg/repository/udmrepo/kopialib/backend/file_system_test.go
+2 -1
View File
@@ -24,6 +24,7 @@ import (
"github.com/kopia/kopia/repo/blob/filesystem"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
)
@@ -73,7 +74,7 @@ func TestFSSetup(t *testing.T) {
err := fsFlags.Setup(context.Background(), tc.flags, logger)
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedOptions, fsFlags.options)
} else {
assert.EqualError(t, err, tc.expectedErr)
pkg/repository/udmrepo/kopialib/backend/gcs_test.go
+2 -1
View File
@@ -24,6 +24,7 @@ import (
"github.com/kopia/kopia/repo/blob/gcs"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
)
@@ -95,7 +96,7 @@ func TestGcsSetup(t *testing.T) {
err := gcsFlags.Setup(context.Background(), tc.flags, logger)
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedOptions, gcsFlags.options)
} else {
assert.EqualError(t, err, tc.expectedErr)
pkg/repository/udmrepo/kopialib/lib_repo_test.go
+6 -6
View File
@@ -422,9 +422,9 @@ func TestWriteInitParameters(t *testing.T) {
err := writeInitParameters(ctx, tc.repoOptions, logger)
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr)
require.EqualError(t, err, tc.expectedErr)
}
if tc.expectedReplaceManifestsParams != nil {
actualReplaceManifestsParams, converted := tc.returnRepoWriter.Calls[0].Arguments.Get(2).(*maintenance.Params)
@@ -1026,7 +1026,7 @@ func TestReaderSeek(t *testing.T) {
ret, err := kr.Seek(0, 0)
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedRet, ret)
} else {
assert.EqualError(t, err, tc.expectedErr)
@@ -1157,7 +1157,7 @@ func TestWriterWrite(t *testing.T) {
ret, err := kr.Write(nil)
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedRet, ret)
} else {
assert.EqualError(t, err, tc.expectedErr)
@@ -1205,7 +1205,7 @@ func TestWriterCheckpoint(t *testing.T) {
ret, err := kr.Checkpoint()
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedRet, ret)
} else {
assert.EqualError(t, err, tc.expectedErr)
@@ -1253,7 +1253,7 @@ func TestWriterResult(t *testing.T) {
ret, err := kr.Result()
if tc.expectedErr == "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tc.expectedRet, ret)
} else {
assert.EqualError(t, err, tc.expectedErr)