fixes

pkg/common/executor_test.go

@@ -17,7 +17,7 @@ func TestNewWorkflow(t *testing.T) {
 
 	// empty
 	emptyWorkflow := NewPipelineExecutor()
-	require.NoError(emptyWorkflow(ctx))
+	require.NoError(t, emptyWorkflow(ctx))
 
 	// error case
 	errorWorkflow := NewErrorExecutor(errors.New("test error"))
@@ -34,7 +34,7 @@ func TestNewWorkflow(t *testing.T) {
 			runcount++
 			return nil
 		})
-	require.NoError(successWorkflow(ctx))
+	require.NoError(t, successWorkflow(ctx))
 	assert.Equal(2, runcount)
 }
 
@@ -56,7 +56,7 @@ func TestNewConditionalExecutor(t *testing.T) {
 		return nil
 	})(ctx)
 
-	require.NoError(err)
+	require.NoError(t, err)
 	assert.Equal(0, trueCount)
 	assert.Equal(1, falseCount)
 
@@ -70,7 +70,7 @@ func TestNewConditionalExecutor(t *testing.T) {
 		return nil
 	})(ctx)
 
-	require.NoError(err)
+	require.NoError(t, err)
 	assert.Equal(1, trueCount)
 	assert.Equal(1, falseCount)
 }
@@ -100,7 +100,7 @@ func TestNewParallelExecutor(t *testing.T) {
 
 	assert.Equal(3, count, "should run all 3 executors")
 	assert.Equal(2, maxCount, "should run at most 2 executors in parallel")
-	require.NoError(err)
+	require.NoError(t, err)
 
 	// Reset to test running the executor with 0 parallelism
 	count = 0
@@ -111,7 +111,7 @@ func TestNewParallelExecutor(t *testing.T) {
 
 	assert.Equal(3, count, "should run all 3 executors")
 	assert.Equal(1, maxCount, "should run at most 1 executors in parallel")
-	require.NoError(errSingle)
+	require.NoError(t, errSingle)
 }
 
 func TestNewParallelExecutorFailed(t *testing.T) {

pkg/common/git/git_test.go

@@ -40,7 +40,7 @@ func TestFindGitSlug(t *testing.T) {
 	for _, tt := range slugTests {
 		provider, slug, err := findGitSlug(tt.url, "github.com")
 
-		require.NoError(err)
+		require.NoError(t, err)
 		assert.Equal(tt.provider, provider)
 		assert.Equal(tt.slug, slug)
 	}
@@ -80,23 +80,23 @@ func TestFindGitRemoteURL(t *testing.T) {
 	basedir := testDir(t)
 	gitConfig()
 	err := gitCmd("init", basedir)
-	require.NoError(err)
+	require.NoError(t, err)
 	err = cleanGitHooks(basedir)
-	require.NoError(err)
+	require.NoError(t, err)
 
 	remoteURL := "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name"
 	err = gitCmd("-C", basedir, "remote", "add", "origin", remoteURL)
-	require.NoError(err)
+	require.NoError(t, err)
 
 	u, err := findGitRemoteURL(context.Background(), basedir, "origin")
-	require.NoError(err)
+	require.NoError(t, err)
 	assert.Equal(remoteURL, u)
 
 	remoteURL = "git@github.com/AwesomeOwner/MyAwesomeRepo.git"
 	err = gitCmd("-C", basedir, "remote", "add", "upstream", remoteURL)
-	require.NoError(err)
+	require.NoError(t, err)
 	u, err = findGitRemoteURL(context.Background(), basedir, "upstream")
-	require.NoError(err)
+	require.NoError(t, err)
 	assert.Equal(remoteURL, u)
 }
 

pkg/common/line_writer_test.go

@@ -19,7 +19,7 @@ func TestLineWriter(t *testing.T) {
 	assert := assert.New(t)
 	write := func(s string) {
 		n, err := lineWriter.Write([]byte(s))
-		require.NoError(err)
+		require.NoError(t, err)
 		assert.Equal(len(s), n, s)
 	}
 

pkg/runner/runner_test.go

@@ -205,7 +205,7 @@ func (j *TestJobFileInfo) runTest(ctx context.Context, t *testing.T, cfg *Config
 	planner, err := model.NewWorkflowPlanner(fullWorkflowPath, model.PlannerConfig{})
 	if j.errorMessage != "" && err != nil {
 		assert.Error(t, err, j.errorMessage)
-	} else if require.NoError(t, err, fullWorkflowPath) {
+	} else if assert.NoError(t, err, fullWorkflowPath) {
 		plan, err := planner.PlanEvent(j.eventName)
 		assert.NotEqual(t, (err == nil), (plan == nil), "PlanEvent should return either a plan or an error")
 		if err == nil && plan != nil {

pkg/schema/schema_test.go

@@ -19,9 +19,7 @@ jobs:
     steps:
     - run: exit 0
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -40,9 +38,7 @@ jobs:
     steps:
     - run: exit 0
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -61,9 +57,7 @@ jobs:
     - run: exit 0
       if: success() || failure() || always()
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -82,9 +76,7 @@ jobs:
     - run: exit 0
       if: ${{ success() || failure() || always() }}
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -101,9 +93,7 @@ jobs:
     runs-on: self-hosted
     x: failure
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -120,9 +110,7 @@ jobs:
     runs-on: self-hosted
     Runs-on: failure
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -140,9 +128,7 @@ jobs:
     steps:
     - run: exit 0
 `), &node)
-	if !require.NoError(t, err) {
+	require.NoError(t, err)
-		return
-	}
 	err = (&Node{
 		Definition: "workflow-root-strict",
 		Schema:     GetWorkflowSchema(),
@@ -209,9 +195,7 @@ jobs:
 		t.Run(test.name, func(t *testing.T) {
 			var node yaml.Node
 			err := yaml.Unmarshal([]byte(test.input), &node)
-			if !require.NoError(t, err) {
+			require.NoError(t, err)
-				return
-			}
 			err = (&Node{
 				Definition: "workflow-root-strict",
 				Schema:     GetWorkflowSchema(),
@@ -247,9 +231,7 @@ runs:
 		t.Run(test.name, func(t *testing.T) {
 			var node yaml.Node
 			err := yaml.Unmarshal([]byte(test.input), &node)
-			if !require.NoError(t, err) {
+			require.NoError(t, err)
-				return
-			}
 			err = (&Node{
 				Definition: "action-root",
 				Schema:     GetActionSchema(),