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

testifylint: enable bool-compare rule (#7623)

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2024-07-16 15:28:23 +02:00
committed by GitHub
parent 917b55e107
commit aa3fde5ea5
15 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/data_download_controller_test.go
View File

@@ -504,11 +504,11 @@ func TestOnDataDownloadFailed(t *testing.T) {
if getErr {
assert.Error(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.NotEqual(t, velerov2alpha1api.DataDownloadPhaseFailed, updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.StartTimestamp.IsZero(), true)
assert.True(t, updatedDD.Status.StartTimestamp.IsZero())
} else {
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.Equal(t, velerov2alpha1api.DataDownloadPhaseFailed, updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.StartTimestamp.IsZero(), true)
assert.True(t, updatedDD.Status.StartTimestamp.IsZero())
}
}
}
@@ -530,12 +530,12 @@ func TestOnDataDownloadCancelled(t *testing.T) {
if getErr {
assert.Error(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.NotEqual(t, velerov2alpha1api.DataDownloadPhaseFailed, updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.StartTimestamp.IsZero(), true)
assert.True(t, updatedDD.Status.StartTimestamp.IsZero())
} else {
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.Equal(t, velerov2alpha1api.DataDownloadPhaseCanceled, updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.StartTimestamp.IsZero(), false)
assert.Equal(t, updatedDD.Status.CompletionTimestamp.IsZero(), false)
assert.False(t, updatedDD.Status.StartTimestamp.IsZero())
assert.False(t, updatedDD.Status.CompletionTimestamp.IsZero())
}
}
}
@@ -582,11 +582,11 @@ func TestOnDataDownloadCompleted(t *testing.T) {
if test.isGetErr {
assert.Error(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.Equal(t, velerov2alpha1api.DataDownloadPhase(""), updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.CompletionTimestamp.IsZero(), true)
assert.True(t, updatedDD.Status.CompletionTimestamp.IsZero())
} else {
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: ddName, Namespace: namespace}, updatedDD))
assert.Equal(t, velerov2alpha1api.DataDownloadPhaseCompleted, updatedDD.Status.Phase)
assert.Equal(t, updatedDD.Status.CompletionTimestamp.IsZero(), false)
assert.False(t, updatedDD.Status.CompletionTimestamp.IsZero())
}
})
}

16
pkg/controller/data_upload_controller_test.go
View File

@@ -576,18 +576,18 @@ func TestReconcile(t *testing.T) {
t.Logf("%s: \n %v \n", test.name, du)
// Assertions
if test.expected == nil {
assert.Equal(t, err != nil, true)
require.Error(t, err)
} else {
require.NoError(t, err)
assert.Equal(t, du.Status.Phase, test.expected.Status.Phase)
}
if test.expectedProcessed {
assert.Equal(t, du.Status.CompletionTimestamp.IsZero(), false)
assert.False(t, du.Status.CompletionTimestamp.IsZero())
}
if !test.expectedProcessed {
assert.Equal(t, du.Status.CompletionTimestamp.IsZero(), true)
assert.True(t, du.Status.CompletionTimestamp.IsZero())
}
if test.checkFunc != nil {
@@ -612,8 +612,8 @@ func TestOnDataUploadCancelled(t *testing.T) {
updatedDu := &velerov2alpha1api.DataUpload{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: duName, Namespace: namespace}, updatedDu))
assert.Equal(t, velerov2alpha1api.DataUploadPhaseCanceled, updatedDu.Status.Phase)
assert.Equal(t, updatedDu.Status.CompletionTimestamp.IsZero(), false)
assert.Equal(t, updatedDu.Status.StartTimestamp.IsZero(), false)
assert.False(t, updatedDu.Status.CompletionTimestamp.IsZero())
assert.False(t, updatedDu.Status.StartTimestamp.IsZero())
}
func TestOnDataUploadProgress(t *testing.T) {
@@ -696,8 +696,8 @@ func TestOnDataUploadFailed(t *testing.T) {
updatedDu := &velerov2alpha1api.DataUpload{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: duName, Namespace: namespace}, updatedDu))
assert.Equal(t, velerov2alpha1api.DataUploadPhaseFailed, updatedDu.Status.Phase)
assert.Equal(t, updatedDu.Status.CompletionTimestamp.IsZero(), false)
assert.Equal(t, updatedDu.Status.StartTimestamp.IsZero(), false)
assert.False(t, updatedDu.Status.CompletionTimestamp.IsZero())
assert.False(t, updatedDu.Status.StartTimestamp.IsZero())
}
func TestOnDataUploadCompleted(t *testing.T) {
@@ -715,7 +715,7 @@ func TestOnDataUploadCompleted(t *testing.T) {
updatedDu := &velerov2alpha1api.DataUpload{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: duName, Namespace: namespace}, updatedDu))
assert.Equal(t, velerov2alpha1api.DataUploadPhaseCompleted, updatedDu.Status.Phase)
assert.Equal(t, updatedDu.Status.CompletionTimestamp.IsZero(), false)
assert.False(t, updatedDu.Status.CompletionTimestamp.IsZero())
}
func TestFindDataUploadForPod(t *testing.T) {