🌱 re-enable paralleltest linter (#3705)

Signed-off-by: Spencer Schrock <[email protected]>
ossf · Dec 4, 2023 · d882fc7 · d882fc7
1 parent 1625b0c
commit d882fc7
Show file tree

Hide file tree

Showing 29 changed files with 104 additions and 38 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -75,7 +75,6 @@ linters:
     - wrapcheck
   disable:
     - exhaustruct # initializing every struct makes tests longer without much benefit (spencerschrock)
-    - paralleltest # need to investigate rate limit issues before re-enabling? (#2527)
     - testpackage # tests don't need their own package (spencerschrock)
   presets:
     - bugs

diff --git a/attestor/command/cli_test.go b/attestor/command/cli_test.go
@@ -20,43 +20,41 @@ import (
 )
 
 func Test_addSignFlags(t *testing.T) {
+	t.Parallel()
 	type args struct {
 		cmd *cobra.Command
 	}
-	testName := "Test addSignFlags"
 	testArgs := args{
 		cmd: &cobra.Command{},
 	}
 
-	t.Run(testName, func(t *testing.T) {
-		addSignFlags(testArgs.cmd)
-		// persistent flags of Image being set has to be tested in the integration test
-		if testArgs.cmd.PersistentFlags().Lookup("image") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'image'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("attestation-project") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'attestation-project'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("overwrite") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'overwrite'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("kms-key-name") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'kms-key-name'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("kms-digest-alg") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'kms-digest-alg'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("pgp-private-key") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'pgp-private-key'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("pgp-passphrase") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'pgp-passphrase'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("pkix-private-key") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'pkix-private-key'")
-		}
-		if testArgs.cmd.PersistentFlags().Lookup("pkix-alg") == nil {
-			t.Errorf("addSignFlags() did not add persistent flag 'pkix-alg'")
-		}
-	})
+	addSignFlags(testArgs.cmd)
+	// persistent flags of Image being set has to be tested in the integration test
+	if testArgs.cmd.PersistentFlags().Lookup("image") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'image'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("attestation-project") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'attestation-project'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("overwrite") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'overwrite'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("kms-key-name") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'kms-key-name'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("kms-digest-alg") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'kms-digest-alg'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("pgp-private-key") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'pgp-private-key'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("pgp-passphrase") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'pgp-passphrase'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("pkix-private-key") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'pkix-private-key'")
+	}
+	if testArgs.cmd.PersistentFlags().Lookup("pkix-alg") == nil {
+		t.Errorf("addSignFlags() did not add persistent flag 'pkix-alg'")
+	}
 }
diff --git a/checker/detail_logger_impl_test.go b/checker/detail_logger_impl_test.go
@@ -18,6 +18,7 @@ import (
 )
 
 func Test_logger_Info(t *testing.T) {
+	t.Parallel()
 	l := &logger{
 		logs: []CheckDetail{},
 	}
@@ -28,6 +29,7 @@ func Test_logger_Info(t *testing.T) {
 }
 
 func Test_logger_Warn(t *testing.T) {
+	t.Parallel()
 	l := &logger{
 		logs: []CheckDetail{},
 	}
@@ -38,6 +40,7 @@ func Test_logger_Warn(t *testing.T) {
 }
 
 func Test_logger_Flush(t *testing.T) {
+	t.Parallel()
 	l := &logger{
 		logs: []CheckDetail{},
 	}
@@ -52,6 +55,7 @@ func Test_logger_Flush(t *testing.T) {
 }
 
 func Test_logger_Logs(t *testing.T) {
+	t.Parallel()
 	l := &logger{
 		logs: []CheckDetail{},
 	}
@@ -62,6 +66,7 @@ func Test_logger_Logs(t *testing.T) {
 }
 
 func Test_logger_Debug(t *testing.T) {
+	t.Parallel()
 	l := &logger{
 		logs: []CheckDetail{},
 	}
@@ -72,6 +77,7 @@ func Test_logger_Debug(t *testing.T) {
 }
 
 func TestNewLogger(t *testing.T) {
+	t.Parallel()
 	l := NewLogger()
 	if l == nil {
 		t.Errorf("expected non-nil logger, got nil")

diff --git a/checker/raw_result_test.go b/checker/raw_result_test.go
@@ -20,6 +20,7 @@ import (
 )
 
 func TestFile_Location(t *testing.T) {
+	t.Parallel()
 	file := File{
 		Type:      finding.FileTypeSource,
 		Path:      "bar.go",

diff --git a/checks/evaluation/pinned_dependencies_test.go b/checks/evaluation/pinned_dependencies_test.go
@@ -988,6 +988,7 @@ func Test_addWorkflowPinnedResult(t *testing.T) {
 }
 
 func TestGenerateText(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name         string
 		dependency   *checker.Dependency
@@ -1016,7 +1017,9 @@ func TestGenerateText(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			result := generateTextUnpinned(tc.dependency)
 			if !cmp.Equal(tc.expectedText, result) {
 				t.Errorf("generateText mismatch (-want +got):\n%s", cmp.Diff(tc.expectedText, result))

diff --git a/checks/evaluation/signed_releases_test.go b/checks/evaluation/signed_releases_test.go
@@ -26,6 +26,7 @@ import (
 )
 
 func TestSignedReleases(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name           string
 		releases       []clients.Release
@@ -93,7 +94,9 @@ func TestSignedReleases(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			dl := &scut.TestDetailLogger{}
 			data := &checker.SignedReleasesData{Releases: tc.releases}
 			actualResult := SignedReleases("Signed-Releases", dl, data)

diff --git a/checks/raw/binary_artifact_test.go b/checks/raw/binary_artifact_test.go
@@ -258,6 +258,7 @@ func TestBinaryArtifacts(t *testing.T) {
 }
 
 func TestBinaryArtifacts_workflow_runs_unsupported(t *testing.T) {
+	t.Parallel()
 	ctrl := gomock.NewController(t)
 	mockRepoClient := mockrepo.NewMockRepoClient(ctrl)
 	const jarFile = "gradle-wrapper.jar"

diff --git a/checks/raw/contributors_test.go b/checks/raw/contributors_test.go
@@ -105,6 +105,7 @@ func TestOrgContains(t *testing.T) {
 }
 
 func TestContributors(t *testing.T) {
+	t.Parallel()
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 

diff --git a/checks/raw/license_test.go b/checks/raw/license_test.go
@@ -646,7 +646,6 @@ func TestLicenseFileCheck(t *testing.T) {
 		},
 	}
 
-	//nolint:paralleltest
 	for _, tt := range tests {
 		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		for _, ext := range tt.extensions {

diff --git a/checks/raw/maintained_test.go b/checks/raw/maintained_test.go
@@ -26,6 +26,7 @@ import (
 	mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
 )
 
+//nolint:paralleltest // need to break into separate tests
 func TestMaintained(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()

diff --git a/checks/raw/shell_download_validate_test.go b/checks/raw/shell_download_validate_test.go
@@ -112,6 +112,7 @@ func TestValidateShellFile(t *testing.T) {
 }
 
 func Test_isDotNetUnpinnedDownload(t *testing.T) {
+	t.Parallel()
 	type args struct {
 		cmd []string
 	}
@@ -206,7 +207,9 @@ func Test_isDotNetUnpinnedDownload(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := isNugetUnpinnedDownload(tt.args.cmd); got != tt.want {
 				t.Errorf("isNugetUnpinnedDownload() = %v, want %v", got, tt.want)
 			}
@@ -215,6 +218,7 @@ func Test_isDotNetUnpinnedDownload(t *testing.T) {
 }
 
 func Test_isGoUnpinnedDownload(t *testing.T) {
+	t.Parallel()
 	type args struct {
 		cmd []string
 	}
@@ -239,7 +243,9 @@ func Test_isGoUnpinnedDownload(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := isGoUnpinnedDownload(tt.args.cmd); got != tt.want {
 				t.Errorf("isGoUnpinnedDownload() = %v, want %v", got, tt.want)
 			}
@@ -248,6 +254,7 @@ func Test_isGoUnpinnedDownload(t *testing.T) {
 }
 
 func Test_isNpmDownload(t *testing.T) {
+	t.Parallel()
 	type args struct {
 		cmd []string
 	}
@@ -272,7 +279,9 @@ func Test_isNpmDownload(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := isNpmDownload(tt.args.cmd); got != tt.want {
 				t.Errorf("isNpmDownload() = %v, want %v", got, tt.want)
 			}
@@ -281,6 +290,7 @@ func Test_isNpmDownload(t *testing.T) {
 }
 
 func Test_isNpmUnpinnedDownload(t *testing.T) {
+	t.Parallel()
 	type args struct {
 		cmd []string
 	}
@@ -305,7 +315,9 @@ func Test_isNpmUnpinnedDownload(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := isNpmUnpinnedDownload(tt.args.cmd); got != tt.want {
 				t.Errorf("isNpmUnpinnedDownload() = %v, want %v", got, tt.want)
 			}

diff --git a/clients/git/client_test.go b/clients/git/client_test.go
@@ -77,8 +77,8 @@ func createTestRepo(t *testing.T) (path string) {
 	return dir
 }
 
-//nolint:paralleltest
 func TestInitRepo(t *testing.T) {
+	t.Parallel()
 	tests := []struct { //nolint:govet
 		name        string
 		uri         string
@@ -112,6 +112,7 @@ func TestInitRepo(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			uri := fmt.Sprintf(test.uri, repoPath)
 
 			client := &Client{}
@@ -124,6 +125,7 @@ func TestInitRepo(t *testing.T) {
 }
 
 func TestListCommits(t *testing.T) {
+	t.Parallel()
 	repoPath := createTestRepo(t)
 
 	client := &Client{}
@@ -147,8 +149,8 @@ func TestListCommits(t *testing.T) {
 	}
 }
 
-//nolint:paralleltest
 func TestSearch(t *testing.T) {
+	t.Parallel()
 	testCases := []struct {
 		name     string
 		request  clients.SearchRequest
@@ -215,7 +217,9 @@ func TestSearch(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			client := &Client{}
 			uri := fmt.Sprintf("file://%s", repoPath)
 			if err := client.InitRepo(uri, "HEAD", 1); err != nil {

diff --git a/clients/githubrepo/checkruns_test.go b/clients/githubrepo/checkruns_test.go
@@ -22,6 +22,7 @@ import (
 )
 
 func Test_init_clearsErr(t *testing.T) {
+	t.Parallel()
 	handler := &checkrunsHandler{errSetup: sce.ErrScorecardInternal}
 	handler.init(context.Background(), nil, 0)
 	if handler.errSetup != nil {

diff --git a/clients/githubrepo/graphql_test.go b/clients/githubrepo/graphql_test.go
@@ -35,6 +35,7 @@ func (b badGatewayRoundTripper) RoundTrip(*http.Request) (*http.Response, error)
 }
 
 func Test_getCommits_retry(t *testing.T) {
+	t.Parallel()
 	var nRequests int
 	rt := badGatewayRoundTripper{requestCounter: &nRequests}
 	handler := graphqlHandler{

diff --git a/clients/githubrepo/internal/fnmatch/fnmatch_test.go b/clients/githubrepo/internal/fnmatch/fnmatch_test.go
@@ -19,6 +19,7 @@ import (
 )
 
 func TestMatch(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		pattern string
 		path    string

diff --git a/clients/githubrepo/roundtripper/tokens/accessor_test.go b/clients/githubrepo/roundtripper/tokens/accessor_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 )
 
-//nolint:paralleltest
+//nolint:paralleltest // test uses t.Setenv
 func TestMakeTokenAccessor(t *testing.T) {
 	tests := []struct {
 		name           string

diff --git a/clients/githubrepo/roundtripper/tokens/round_robin_test.go b/clients/githubrepo/roundtripper/tokens/round_robin_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 )
 
-//golint:paralleltest
+//nolint:paralleltest // order dependent
 func TestNext(t *testing.T) {
 	tokens := []string{"token1", "token2", "token3", "token4", "token5"}
 	rr := makeRoundRobinAccessor(tokens)
@@ -35,6 +35,7 @@ func TestNext(t *testing.T) {
 	}
 
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.releaseID != nil {
 				rr.Release(*tt.releaseID)

diff --git a/clients/githubrepo/roundtripper/tokens/rpc_test.go b/clients/githubrepo/roundtripper/tokens/rpc_test.go
@@ -45,6 +45,7 @@ func newMockTokenAccessor(tokens []string) *mockTokenAccessor {
 }
 
 func TestTokenOverRPC_Next(t *testing.T) {
+	t.Parallel()
 	mockClient := newMockTokenAccessor([]string{"token1", "token2", "token3"})
 	rpc := NewTokenOverRPC(mockClient)
 	token := &Token{}
@@ -66,6 +67,7 @@ func TestTokenOverRPC_Next(t *testing.T) {
 }
 
 func TestTokenOverRPC_Release(t *testing.T) {
+	t.Parallel()
 	mockClient := newMockTokenAccessor([]string{"token1", "token2", "token3"})
 	rpc := NewTokenOverRPC(mockClient)
 

diff --git a/clients/gitlabrepo/repo_test.go b/clients/gitlabrepo/repo_test.go
@@ -119,6 +119,7 @@ func TestRepoURL_IsValid(t *testing.T) {
 }
 
 func TestRepoURL_MakeGitLabRepo(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		repouri      string
 		expected     bool