Merge pull request vmware-tanzu#7592 from mmorel-35/gosimple

golangci-lint(gosimple): fix test files
reasonerjt · May 27, 2024 · c8e252c · c8e252c
2 parents 18921fc + 75fe761
commit c8e252c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -360,7 +360,6 @@ issues:
         - errcheck
         - goconst
         - gosec
-        - gosimple
         - nilerr
         - staticcheck
         - stylecheck

diff --git a/test/e2e/basic/backup-volume-info/csi_data_mover.go b/test/e2e/basic/backup-volume-info/csi_data_mover.go
@@ -55,7 +55,7 @@ func (c *CSIDataMoverVolumeInfo) Verify() error {
 		BackupObjectsPrefix+"/"+c.BackupName,
 	)
 
-	Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("Fail to get VolumeInfo metadata in the Backup Repository."))
+	Expect(err).ShouldNot(HaveOccurred(), "Fail to get VolumeInfo metadata in the Backup Repository.")
 
 	fmt.Printf("The VolumeInfo metadata content: %+v\n", *volumeInfo[0])
 	Expect(len(volumeInfo) > 0).To(BeIdenticalTo(true))

diff --git a/test/e2e/basic/backup-volume-info/csi_snapshot.go b/test/e2e/basic/backup-volume-info/csi_snapshot.go
@@ -54,7 +54,7 @@ func (c *CSISnapshotVolumeInfo) Verify() error {
 		BackupObjectsPrefix+"/"+c.BackupName,
 	)
 
-	Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("Fail to get VolumeInfo metadata in the Backup Repository."))
+	Expect(err).ShouldNot(HaveOccurred(), "Fail to get VolumeInfo metadata in the Backup Repository.")
 
 	fmt.Printf("The VolumeInfo metadata content: %+v\n", *volumeInfo[0])
 	Expect(len(volumeInfo) > 0).To(BeIdenticalTo(true))

diff --git a/test/e2e/basic/backup-volume-info/filesystem_upload.go b/test/e2e/basic/backup-volume-info/filesystem_upload.go
@@ -54,7 +54,7 @@ func (f *FilesystemUploadVolumeInfo) Verify() error {
 		BackupObjectsPrefix+"/"+f.BackupName,
 	)
 
-	Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("Fail to get VolumeInfo metadata in the Backup Repository."))
+	Expect(err).ShouldNot(HaveOccurred(), "Fail to get VolumeInfo metadata in the Backup Repository.")
 
 	fmt.Printf("The VolumeInfo metadata content: %+v\n", *volumeInfo[0])
 	Expect(len(volumeInfo) > 0).To(BeIdenticalTo(true))

diff --git a/test/e2e/basic/backup-volume-info/skipped_volumes.go b/test/e2e/basic/backup-volume-info/skipped_volumes.go
@@ -54,11 +54,11 @@ func (s *SkippedVolumeInfo) Verify() error {
 		BackupObjectsPrefix+"/"+s.BackupName,
 	)
 
-	Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("Fail to get VolumeInfo metadata in the Backup Repository."))
+	Expect(err).ShouldNot(HaveOccurred(), "Fail to get VolumeInfo metadata in the Backup Repository.")
 
 	fmt.Printf("The VolumeInfo metadata content: %+v\n", *volumeInfo[0])
 	Expect(len(volumeInfo) > 0).To(BeIdenticalTo(true))
-	Expect(volumeInfo[0].Skipped == true).To(BeIdenticalTo(true))
+	Expect(volumeInfo[0].Skipped).To(BeIdenticalTo(true))
 
 	// Clean SC and VSC
 	return s.cleanResource()

diff --git a/test/perf/backup/backup.go b/test/perf/backup/backup.go
@@ -18,7 +18,6 @@ package backup
 
 import (
 	"context"
-	"fmt"
 	"strings"
 	"time"
 
@@ -48,7 +47,7 @@ func (b *BackupTest) Init() error {
 	b.TestMsg = &TestMSG{
 		Desc:      "Do backup resources for performance test",
 		FailedMSG: "Failed to backup resources",
-		Text:      fmt.Sprintf("Should backup resources success"),
+		Text:      "Should backup resources success",
 	}
 	return nil
 }
diff --git a/test/perf/restore/restore.go b/test/perf/restore/restore.go
@@ -18,7 +18,6 @@ package restore
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
@@ -42,7 +41,7 @@ func (r *RestoreTest) Init() error {
 	r.TestMsg = &TestMSG{
 		Desc:      "Do restore resources for performance test",
 		FailedMSG: "Failed to restore resources",
-		Text:      fmt.Sprintf("Should restore resources success"),
+		Text:      "Should restore resources success",
 	}
 	return nil
 }