Merge pull request #12313 from hashicorp/purge-parallel-2

ci: more parallel removal
hashicorp · Mar 17, 2022 · 4bf0dec · 4bf0dec
2 parents eca4ac6 + fec8d6e
commit 4bf0dec
Show file tree

Hide file tree

Showing 34 changed files with 260 additions and 195 deletions.
diff --git a/.semgrep/go_tests.yml b/.semgrep/go_tests.yml
@@ -119,3 +119,14 @@ rules:
       exclude: ["*"]
       include:
         - "*_test.go"
+  - id: "tests-no-parallel"
+    patterns:
+      - pattern: "t.Parallel()"
+    message: "Use ci.Parallel(t) instead of t.Parallel()"
+    languages:
+      - "go"
+    severity: "WARNING"
+    fix: "ci.Parallel(t)"
+    paths:
+      include:
+        - "*_test.go"
diff --git a/api/acl_test.go b/api/acl_test.go
@@ -3,11 +3,12 @@ package api
 import (
 	"testing"
 
+	"github.com/hashicorp/nomad/api/internal/testutil"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestACLPolicies_ListUpsert(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	ap := c.ACLPolicies()
@@ -49,7 +50,7 @@ func TestACLPolicies_ListUpsert(t *testing.T) {
 }
 
 func TestACLPolicies_Delete(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	ap := c.ACLPolicies()
@@ -84,7 +85,7 @@ func TestACLPolicies_Delete(t *testing.T) {
 }
 
 func TestACLPolicies_Info(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	ap := c.ACLPolicies()
@@ -110,7 +111,7 @@ func TestACLPolicies_Info(t *testing.T) {
 }
 
 func TestACLTokens_List(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()
@@ -129,7 +130,7 @@ func TestACLTokens_List(t *testing.T) {
 }
 
 func TestACLTokens_CreateUpdate(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()
@@ -158,7 +159,7 @@ func TestACLTokens_CreateUpdate(t *testing.T) {
 }
 
 func TestACLTokens_Info(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()
@@ -183,7 +184,7 @@ func TestACLTokens_Info(t *testing.T) {
 }
 
 func TestACLTokens_Self(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()
@@ -213,7 +214,7 @@ func TestACLTokens_Self(t *testing.T) {
 }
 
 func TestACLTokens_Delete(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()
@@ -237,7 +238,7 @@ func TestACLTokens_Delete(t *testing.T) {
 }
 
 func TestACL_OneTimeToken(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s, _ := makeACLClient(t, nil, nil)
 	defer s.Stop()
 	at := c.ACLTokens()

diff --git a/api/agent_test.go b/api/agent_test.go
@@ -9,15 +9,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kr/pretty"
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/nomad/api/internal/testutil"
+	"github.com/kr/pretty"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAgent_Self(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 
@@ -42,7 +41,7 @@ func TestAgent_Self(t *testing.T) {
 }
 
 func TestAgent_NodeName(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Agent()
@@ -58,7 +57,7 @@ func TestAgent_NodeName(t *testing.T) {
 }
 
 func TestAgent_Datacenter(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Agent()
@@ -74,7 +73,7 @@ func TestAgent_Datacenter(t *testing.T) {
 }
 
 func TestAgent_Join(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c1, s1 := makeClient(t, nil, nil)
 	defer s1.Stop()
 	a1 := c1.Agent()
@@ -104,7 +103,7 @@ func TestAgent_Join(t *testing.T) {
 }
 
 func TestAgent_Members(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Agent()
@@ -125,7 +124,7 @@ func TestAgent_Members(t *testing.T) {
 }
 
 func TestAgent_ForceLeave(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Agent()
@@ -143,7 +142,7 @@ func (a *AgentMember) String() string {
 }
 
 func TestAgents_Sort(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	var sortTests = []struct {
 		in  []*AgentMember
 		out []*AgentMember
@@ -254,7 +253,7 @@ func TestAgents_Sort(t *testing.T) {
 }
 
 func TestAgent_Health(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	assert := assert.New(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
@@ -269,7 +268,7 @@ func TestAgent_Health(t *testing.T) {
 // passing in a log level and node ie, which tests monitor
 // functionality for a specific client node
 func TestAgent_MonitorWithNode(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	rpcPort := 0
 	c, s := makeClient(t, nil, func(c *testutil.TestServerConfig) {
 		rpcPort = c.Ports.RPC
@@ -339,7 +338,7 @@ OUTER:
 // passing in only a log level, which tests the servers
 // monitor functionality
 func TestAgent_Monitor(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 
@@ -379,7 +378,7 @@ OUTER:
 }
 
 func TestAgentCPUProfile(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	c, s, token := makeACLClient(t, nil, nil)
 	defer s.Stop()
@@ -415,7 +414,7 @@ func TestAgentCPUProfile(t *testing.T) {
 }
 
 func TestAgentTrace(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	c, s, token := makeACLClient(t, nil, nil)
 	defer s.Stop()
@@ -432,7 +431,7 @@ func TestAgentTrace(t *testing.T) {
 }
 
 func TestAgentProfile(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	c, s, token := makeACLClient(t, nil, nil)
 	defer s.Stop()
@@ -459,7 +458,7 @@ func TestAgentProfile(t *testing.T) {
 }
 
 func TestAgent_SchedulerWorkerConfig(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
@@ -475,7 +474,7 @@ func TestAgent_SchedulerWorkerConfig(t *testing.T) {
 }
 
 func TestAgent_SchedulerWorkerConfig_BadRequest(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
@@ -491,7 +490,7 @@ func TestAgent_SchedulerWorkerConfig_BadRequest(t *testing.T) {
 }
 
 func TestAgent_SchedulerWorkersInfo(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Agent()

diff --git a/api/allocations_test.go b/api/allocations_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestAllocations_List(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, func(c *testutil.TestServerConfig) {
 		c.DevMode = true
 	})
@@ -58,7 +58,7 @@ func TestAllocations_List(t *testing.T) {
 }
 
 func TestAllocations_PrefixList(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, nil)
 	defer s.Stop()
 	a := c.Allocations()
@@ -106,7 +106,7 @@ func TestAllocations_PrefixList(t *testing.T) {
 }
 
 func TestAllocations_List_Resources(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	c, s := makeClient(t, nil, func(c *testutil.TestServerConfig) {
 		c.DevMode = true
 	})
@@ -137,7 +137,7 @@ func TestAllocations_List_Resources(t *testing.T) {
 }
 
 func TestAllocations_CreateIndexSort(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	allocs := []*AllocationListStub{
 		{CreateIndex: 2},
 		{CreateIndex: 1},
@@ -156,7 +156,7 @@ func TestAllocations_CreateIndexSort(t *testing.T) {
 }
 
 func TestAllocations_RescheduleInfo(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	// Create a job, task group and alloc
 	job := &Job{
 		Name:      stringToPtr("foo"),
@@ -317,7 +317,7 @@ func TestAllocations_ExecErrors(t *testing.T) {
 }
 
 func TestAllocation_ServerTerminalStatus(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	testCases := []struct {
 		inputAllocation *Allocation
@@ -349,7 +349,7 @@ func TestAllocation_ServerTerminalStatus(t *testing.T) {
 }
 
 func TestAllocation_ClientTerminalStatus(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 
 	testCases := []struct {
 		inputAllocation *Allocation
@@ -391,7 +391,7 @@ func TestAllocation_ClientTerminalStatus(t *testing.T) {
 }
 
 func TestAllocations_ShouldMigrate(t *testing.T) {
-	t.Parallel()
+	testutil.Parallel(t)
 	require.True(t, DesiredTransition{Migrate: boolToPtr(true)}.ShouldMigrate())
 	require.False(t, DesiredTransition{}.ShouldMigrate())
 	require.False(t, DesiredTransition{Migrate: boolToPtr(false)}.ShouldMigrate())