testifylint: enable bool-compare rule (#7623)

Signed-off-by: Matthieu MOREL <[email protected]>
vmware-tanzu · Jul 16, 2024 · aa3fde5 · aa3fde5
1 parent 917b55e
commit aa3fde5
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 34 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -238,7 +238,6 @@ linters-settings:
   testifylint:
       # TODO: enable them all
       disable:
-        - bool-compare
         - error-is-as
         - error-nil
         - expected-actual

diff --git a/pkg/client/config_test.go b/pkg/client/config_test.go
@@ -33,7 +33,7 @@ func TestVeleroConfig(t *testing.T) {
 
 	assert.Equal(t, "foo", c.Namespace())
 	assert.Equal(t, []string{"feature1", "feature2"}, c.Features())
-	assert.Equal(t, true, c.Colorized())
+	assert.True(t, c.Colorized())
 }
 
 func removeConfigfileName() error {

diff --git a/pkg/cmd/cli/backup/create_test.go b/pkg/cmd/cli/backup/create_test.go
@@ -247,7 +247,7 @@ func TestCreateCommand(t *testing.T) {
 		require.Equal(t, excludeClusterScopedResources, o.ExcludeClusterScopedResources.String())
 		require.Equal(t, includeNamespaceScopedResources, o.IncludeNamespaceScopedResources.String())
 		require.Equal(t, excludeNamespaceScopedResources, o.ExcludeNamespaceScopedResources.String())
-		require.Equal(t, true, test.CompareSlice(strings.Split(labels, ","), strings.Split(o.Labels.String(), ",")))
+		require.True(t, test.CompareSlice(strings.Split(labels, ","), strings.Split(o.Labels.String(), ",")))
 		require.Equal(t, storageLocation, o.StorageLocation)
 		require.Equal(t, snapshotLocations, strings.Split(o.SnapshotLocations[0], ",")[0])
 		require.Equal(t, selector, o.Selector.String())
@@ -265,7 +265,7 @@ func TestCreateCommand(t *testing.T) {
 
 		// verify oldAndNewFilterParametersUsedTogether
 		mix := o.oldAndNewFilterParametersUsedTogether()
-		require.Equal(t, true, mix)
+		require.True(t, mix)
 	})
 
 	t.Run("create a backup create command with specific storage-location setting", func(t *testing.T) {

diff --git a/pkg/cmd/cli/backuplocation/create_test.go b/pkg/cmd/cli/backuplocation/create_test.go
@@ -157,13 +157,13 @@ func TestCreateCommand_Run(t *testing.T) {
 	assert.Equal(t, name, o.Name)
 	assert.Equal(t, provider, o.Provider)
 	assert.Equal(t, bucket, o.Bucket)
-	assert.Equal(t, true, reflect.DeepEqual(credential, o.Credential))
+	assert.True(t, reflect.DeepEqual(credential, o.Credential))
 	assert.Equal(t, defaultBackupStorageLocation, o.DefaultBackupStorageLocation)
 	assert.Equal(t, prefix, o.Prefix)
 	assert.Equal(t, backupSyncPeriod, o.BackupSyncPeriod.String())
 	assert.Equal(t, validationFrequency, o.ValidationFrequency.String())
-	assert.Equal(t, true, reflect.DeepEqual(bslConfig, o.Config))
-	assert.Equal(t, true, velerotest.CompareSlice(strings.Split(labels, ","), strings.Split(o.Labels.String(), ",")))
+	assert.True(t, reflect.DeepEqual(bslConfig, o.Config))
+	assert.True(t, velerotest.CompareSlice(strings.Split(labels, ","), strings.Split(o.Labels.String(), ",")))
 	assert.Equal(t, caCertFile, o.CACertFile)
 	assert.Equal(t, accessMode, o.AccessMode.String())
 

diff --git a/pkg/cmd/cli/backuplocation/set_test.go b/pkg/cmd/cli/backuplocation/set_test.go
@@ -75,7 +75,7 @@ func TestNewSetCommand(t *testing.T) {
 	assert.Equal(t, backupName, o.Name)
 	assert.Equal(t, cacert, o.CACertFile)
 	assert.Equal(t, defaultBackupStorageLocation, boolptr.IsSetToTrue(o.DefaultBackupStorageLocation.Value))
-	assert.Equal(t, true, reflect.DeepEqual(credential, o.Credential))
+	assert.True(t, reflect.DeepEqual(credential, o.Credential))
 
 	assert.Contains(t, e.Error(), fmt.Sprintf("%s: no such file or directory", cacert))
 }

diff --git a/pkg/controller/data_download_controller_test.go b/pkg/controller/data_download_controller_test.go
@@ -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())
 			}
 		})
 	}

diff --git a/pkg/controller/data_upload_controller_test.go b/pkg/controller/data_upload_controller_test.go
@@ -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) {

diff --git a/pkg/exposer/csi_snapshot_test.go b/pkg/exposer/csi_snapshot_test.go
@@ -807,7 +807,7 @@ func TestToSystemAffinity(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			affinity := toSystemAffinity(test.loadAffinity)
-			assert.Equal(t, true, reflect.DeepEqual(affinity, test.expected))
+			assert.True(t, reflect.DeepEqual(affinity, test.expected))
 		})
 	}
 }
diff --git a/pkg/podvolume/restorer_test.go b/pkg/podvolume/restorer_test.go
@@ -442,7 +442,7 @@ func TestRestorePodVolumes(t *testing.T) {
 									break
 								}
 							}
-							assert.Equal(t, true, j < len(test.errs))
+							assert.Less(t, j, len(test.errs))
 						}
 					}
 				}

diff --git a/pkg/restore/actions/apiservice_action_test.go b/pkg/restore/actions/apiservice_action_test.go
@@ -49,5 +49,5 @@ func TestAPIServiceActionExecuteSkipsRestore(t *testing.T) {
 	var apiService apiregistrationv1.APIService
 	require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(res.UpdatedItem.UnstructuredContent(), &apiService))
 	require.Equal(t, obj, apiService)
-	require.Equal(t, true, res.SkipRestore)
+	require.True(t, res.SkipRestore)
 }
diff --git a/pkg/restore/actions/change_pvc_node_selector_test.go b/pkg/restore/actions/change_pvc_node_selector_test.go
@@ -168,7 +168,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) {
 
 			// Make sure mapped selected-node exists.
 			logOutput := buf.String()
-			assert.Equal(t, strings.Contains(logOutput, "Selected-node's mapped node doesn't exist"), false)
+			assert.False(t, strings.Contains(logOutput, "Selected-node's mapped node doesn't exist"))
 
 			// validate for both error and non-error cases
 			switch {

diff --git a/pkg/uploader/provider/restic_test.go b/pkg/uploader/provider/restic_test.go
@@ -156,7 +156,7 @@ func TestResticRunBackup(t *testing.T) {
 			}
 
 			tc.rp.log.Infof("test name %v error %v", tc.name, err)
-			require.Equal(t, true, tc.errorHandleFunc(err))
+			require.True(t, tc.errorHandleFunc(err))
 		})
 	}
 }
@@ -229,7 +229,7 @@ func TestResticRunRestore(t *testing.T) {
 			}
 
 			tc.rp.log.Infof("test name %v error %v", tc.name, err)
-			require.Equal(t, true, tc.errorHandleFunc(err))
+			require.True(t, tc.errorHandleFunc(err))
 		})
 	}
 }

diff --git a/pkg/util/kube/periodical_enqueue_source_test.go b/pkg/util/kube/periodical_enqueue_source_test.go
@@ -172,7 +172,7 @@ func TestOrder(t *testing.T) {
 	bsl := &velerov1.BackupStorageLocation{}
 	require.Equal(t, "location2", first.(reconcile.Request).Name)
 	require.Nil(t, client.Get(ctx, first.(reconcile.Request).NamespacedName, bsl))
-	require.Equal(t, true, bsl.Spec.Default)
+	require.True(t, bsl.Spec.Default)
 
 	cancelFunc()
 }
diff --git a/pkg/util/logging/dual_mode_logger_test.go b/pkg/util/logging/dual_mode_logger_test.go
@@ -49,14 +49,14 @@ func TestDualModeLogger(t *testing.T) {
 	logStr, err := readLogString(logFile)
 	require.NoError(t, err)
 
-	assert.Equal(t, true, strings.Contains(logStr, logMsgExpect))
-	assert.Equal(t, false, strings.Contains(logStr, logMsgUnexpect))
+	assert.True(t, strings.Contains(logStr, logMsgExpect))
+	assert.False(t, strings.Contains(logStr, logMsgUnexpect))
 
 	logger.Dispose(velerotest.NewLogger())
 
 	_, err = os.Stat(logFile.Name())
 
-	assert.Equal(t, true, os.IsNotExist(err))
+	assert.True(t, os.IsNotExist(err))
 }
 
 func readLogString(file *os.File) (string, error) {

diff --git a/test/pkg/client/config_test.go b/test/pkg/client/config_test.go
@@ -30,5 +30,5 @@ func TestVeleroConfig(t *testing.T) {
 
 	assert.Equal(t, "foo", c.Namespace())
 	assert.Equal(t, []string{"feature1", "feature2"}, c.Features())
-	assert.Equal(t, true, c.Colorized())
+	assert.True(t, c.Colorized())
 }