From bffc6007755f482bc2c2dfc031f7c22bca276a29 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 22 Feb 2026 21:12:25 +0100 Subject: [PATCH] fixes --- internal/app/cmd/register_test.go | 4 ++-- internal/templateeval/rewrite_subexpression_test.go | 4 ++-- pkg/artifactcache/handler_test.go | 2 +- pkg/artifacts/server_test.go | 2 +- pkg/common/executor_test.go | 2 +- pkg/common/git/git_test.go | 2 +- pkg/container/docker_cli_test.go | 5 +++-- pkg/container/docker_run_test.go | 2 +- pkg/container/docker_socket_test.go | 2 +- pkg/exprparser/interpreter_test.go | 2 +- pkg/model/anchors_test.go | 7 +++---- pkg/model/workflow_test.go | 12 ++++++------ pkg/runner/expression_test.go | 4 ++-- pkg/runner/runner_test.go | 6 +++--- pkg/runner/step_factory_test.go | 2 +- pkg/runner/step_test.go | 12 ++++++------ pkg/schema/schema_test.go | 6 +++--- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/internal/app/cmd/register_test.go b/internal/app/cmd/register_test.go index 2978e6e5..02d26918 100644 --- a/internal/app/cmd/register_test.go +++ b/internal/app/cmd/register_test.go @@ -6,7 +6,7 @@ package cmd import ( "testing" - "gotest.tools/v3/assert" + "github.com/stretchr/testify/require" ) func TestRegisterNonInteractiveReturnsLabelValidationError(t *testing.T) { @@ -15,5 +15,5 @@ func TestRegisterNonInteractiveReturnsLabelValidationError(t *testing.T) { Token: "token", InstanceAddr: "http://localhost:3000", }) - assert.Error(t, err, "unsupported schema: invalid") + require.Error(t, err, "unsupported schema: invalid") } diff --git a/internal/templateeval/rewrite_subexpression_test.go b/internal/templateeval/rewrite_subexpression_test.go index 0c32ae0a..0fb9e1ef 100644 --- a/internal/templateeval/rewrite_subexpression_test.go +++ b/internal/templateeval/rewrite_subexpression_test.go @@ -74,14 +74,14 @@ func TestRewriteSubExpression_ForceFormatMultiple(t *testing.T) { func TestRewriteSubExpression_UnclosedExpression(t *testing.T) { in := "Hello ${{ 'world' " // missing closing }} _, _, err := rewriteSubExpression(in, false) - assert.Error(t, err) + require.Error(t, err) assert.Contains(t, err.Error(), "unclosed expression") } func TestRewriteSubExpression_UnclosedString(t *testing.T) { in := "Hello ${{ 'world }}, you are ${{ 'awesome' }}" _, _, err := rewriteSubExpression(in, false) - assert.Error(t, err) + require.Error(t, err) assert.Contains(t, err.Error(), "unclosed string") } diff --git a/pkg/artifactcache/handler_test.go b/pkg/artifactcache/handler_test.go index c8082fe9..d1030f9e 100644 --- a/pkg/artifactcache/handler_test.go +++ b/pkg/artifactcache/handler_test.go @@ -42,7 +42,7 @@ func TestHandler(t *testing.T) { assert.Nil(t, handler.server) assert.Nil(t, handler.listener) _, err := http.Post(fmt.Sprintf("%s/caches/%d", base, 1), "", nil) - assert.Error(t, err) + require.Error(t, err) }) }() diff --git a/pkg/artifacts/server_test.go b/pkg/artifacts/server_test.go index 63c3e4be..a60e6e55 100644 --- a/pkg/artifacts/server_test.go +++ b/pkg/artifacts/server_test.go @@ -311,7 +311,7 @@ func runTestJobFile(ctx context.Context, t *testing.T, tjfi TestJobFileInfo) { if tjfi.errorMessage == "" { require.NoError(t, err, fullWorkflowPath) } else { - assert.Error(t, err, tjfi.errorMessage) + require.Error(t, err, tjfi.errorMessage) } } else { assert.Nil(t, plan) diff --git a/pkg/common/executor_test.go b/pkg/common/executor_test.go index 7143d212..e4a7dfa4 100644 --- a/pkg/common/executor_test.go +++ b/pkg/common/executor_test.go @@ -21,7 +21,7 @@ func TestNewWorkflow(t *testing.T) { // error case errorWorkflow := NewErrorExecutor(errors.New("test error")) - assert.Error(errorWorkflow(ctx)) + require.Error(t, errorWorkflow(ctx)) // multiple success case runcount := 0 diff --git a/pkg/common/git/git_test.go b/pkg/common/git/git_test.go index 8d939e9c..efb68757 100644 --- a/pkg/common/git/git_test.go +++ b/pkg/common/git/git_test.go @@ -213,7 +213,7 @@ func TestGitCloneExecutor(t *testing.T) { err := clone(context.Background()) if tt.Err != nil { - assert.Error(t, err) + require.Error(t, err) assert.Equal(t, tt.Err, err) } else { require.NoError(t, err) diff --git a/pkg/container/docker_cli_test.go b/pkg/container/docker_cli_test.go index d4336f49..4e321154 100644 --- a/pkg/container/docker_cli_test.go +++ b/pkg/container/docker_cli_test.go @@ -23,6 +23,7 @@ import ( "github.com/docker/go-connections/nat" "github.com/pkg/errors" "github.com/spf13/pflag" + "github.com/stretchr/testify/require" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" @@ -185,7 +186,7 @@ func TestParseRunWithInvalidArgs(t *testing.T) { flags, _ := setupRunFlags() for _, tc := range tests { t.Run(strings.Join(tc.args, " "), func(t *testing.T) { - assert.Error(t, flags.Parse(tc.args), tc.error) + require.Error(t, flags.Parse(tc.args), tc.error) }) } } @@ -606,7 +607,7 @@ func TestParseNetworkConfig(t *testing.T) { _, hConfig, nwConfig, err := parseRun(tc.flags) if tc.expectedErr != "" { - assert.Error(t, err, tc.expectedErr) + require.Error(t, err, tc.expectedErr) return } diff --git a/pkg/container/docker_run_test.go b/pkg/container/docker_run_test.go index 78368015..bcd7e3ab 100644 --- a/pkg/container/docker_run_test.go +++ b/pkg/container/docker_run_test.go @@ -184,7 +184,7 @@ func TestDockerExecFailure(t *testing.T) { } err := cr.execExt([]string{""}, map[string]string{}, "user", "workdir")(ctx) - assert.Error(t, err, "exit with `FAILURE`: 1") + require.Error(t, err, "exit with `FAILURE`: 1") conn.AssertExpectations(t) client.AssertExpectations(t) diff --git a/pkg/container/docker_socket_test.go b/pkg/container/docker_socket_test.go index 38c77d29..deb9857a 100644 --- a/pkg/container/docker_socket_test.go +++ b/pkg/container/docker_socket_test.go @@ -128,7 +128,7 @@ func TestGetSocketAndHostNoHostInvalidSocket(t *testing.T) { assert.False(t, found, "Expected no default socket to be found") assert.Empty(t, defaultSocket, "Expected no default socket to be found") assert.Equal(t, SocketAndHost{}, ret, "Expected to match default socket location") - assert.Error(t, err, "Expected an error in invalid state") + require.Error(t, err, "Expected an error in invalid state") } func TestGetSocketAndHostOnlySocketValidButUnusualLocation(t *testing.T) { diff --git a/pkg/exprparser/interpreter_test.go b/pkg/exprparser/interpreter_test.go index 791e43b2..c13fd6e3 100644 --- a/pkg/exprparser/interpreter_test.go +++ b/pkg/exprparser/interpreter_test.go @@ -103,7 +103,7 @@ func TestOperators(t *testing.T) { t.Run(tt.name, func(t *testing.T) { output, err := NewInterpeter(env, Config{}).Evaluate(tt.input, DefaultStatusCheckNone) if tt.error != "" { - assert.Error(t, err) + require.Error(t, err) assert.Equal(t, tt.error, err.Error()) } else { require.NoError(t, err) diff --git a/pkg/model/anchors_test.go b/pkg/model/anchors_test.go index 1ef272fd..df0d72b6 100644 --- a/pkg/model/anchors_test.go +++ b/pkg/model/anchors_test.go @@ -3,7 +3,6 @@ package model import ( "testing" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) @@ -20,7 +19,7 @@ test: } require.NoError(t, err) err = resolveAliases(&node) - assert.Error(t, err) + require.Error(t, err) } func TestVerifyNoRecursion(t *testing.T) { @@ -100,13 +99,13 @@ c: *a var node yaml.Node err := yaml.Unmarshal([]byte(tt.yaml), &node) if tt.yamlErr { - assert.Error(t, err) + require.Error(t, err) return } require.NoError(t, err) err = resolveAliases(&node) if tt.anchorErr { - assert.Error(t, err) + require.Error(t, err) } else { require.NoError(t, err) } diff --git a/pkg/model/workflow_test.go b/pkg/model/workflow_test.go index 4a8b5e0d..18001ff5 100644 --- a/pkg/model/workflow_test.go +++ b/pkg/model/workflow_test.go @@ -246,19 +246,19 @@ jobs: jobType, err := workflow.Jobs["remote-reusable-workflow-missing-version"].Type() assert.Equal(t, JobTypeInvalid, jobType) - assert.Error(t, err) + require.Error(t, err) jobType, err = workflow.Jobs["remote-reusable-workflow-bad-extension"].Type() assert.Equal(t, JobTypeInvalid, jobType) - assert.Error(t, err) + require.Error(t, err) jobType, err = workflow.Jobs["local-reusable-workflow-bad-extension"].Type() assert.Equal(t, JobTypeInvalid, jobType) - assert.Error(t, err) + require.Error(t, err) jobType, err = workflow.Jobs["local-reusable-workflow-bad-path"].Type() assert.Equal(t, JobTypeInvalid, jobType) - assert.Error(t, err) + require.Error(t, err) } func TestReadWorkflow_StepsTypes(t *testing.T) { @@ -283,7 +283,7 @@ jobs: ` _, err := ReadWorkflow(strings.NewReader(yaml), WorkflowConfig{}) - assert.Error(t, err, "read workflow should fail") + require.Error(t, err, "read workflow should fail") } // See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs @@ -582,7 +582,7 @@ jobs: ` _, err := ReadWorkflow(strings.NewReader(yaml), WorkflowConfig{Strict: true}) - assert.Error(t, err, "read workflow should succeed") + require.Error(t, err, "read workflow should succeed") } func TestReadWorkflow_AnchorStrict(t *testing.T) { diff --git a/pkg/runner/expression_test.go b/pkg/runner/expression_test.go index 7dda6928..dbd714bb 100644 --- a/pkg/runner/expression_test.go +++ b/pkg/runner/expression_test.go @@ -144,7 +144,7 @@ func TestEvaluateRunContext(t *testing.T) { assertObject := assert.New(t) out, err := ee.evaluate(context.Background(), table.in, exprparser.DefaultStatusCheckNone) if table.errMesg == "" { - assertObject.NoError(err, table.in) + require.NoError(t, err, table.in) if i, ok := table.out.(int); ok { table.out = float64(i) } @@ -186,7 +186,7 @@ func TestEvaluateStep(t *testing.T) { assertObject := assert.New(t) out, err := ee.evaluate(context.Background(), table.in, exprparser.DefaultStatusCheckNone) if table.errMesg == "" { - assertObject.NoError(err, table.in) + require.NoError(t, err, table.in) assertObject.Equal(table.out, out, table.in) } else { assertObject.Error(err, table.in) diff --git a/pkg/runner/runner_test.go b/pkg/runner/runner_test.go index 38fd5fcb..1471c2d6 100644 --- a/pkg/runner/runner_test.go +++ b/pkg/runner/runner_test.go @@ -134,7 +134,7 @@ func TestGraphWithSomeMissing(t *testing.T) { log.SetLevel(log.DebugLevel) plan, err := planner.PlanAll() - assert.Error(t, err, "unable to build dependency graph for no first (no-first.yml)") + require.Error(t, err, "unable to build dependency graph for no first (no-first.yml)") assert.NotNil(t, plan) assert.Len(t, plan.Stages, 1) assert.Contains(t, buf.String(), "unable to build dependency graph for missing (missing.yml)") @@ -204,7 +204,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) + require.Error(t, err, j.errorMessage) } 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") @@ -213,7 +213,7 @@ func (j *TestJobFileInfo) runTest(ctx context.Context, t *testing.T, cfg *Config if j.errorMessage == "" { require.NoError(t, err, fullWorkflowPath) } else { - assert.Error(t, err, j.errorMessage) + require.Error(t, err, j.errorMessage) } } } diff --git a/pkg/runner/step_factory_test.go b/pkg/runner/step_factory_test.go index 3fc17ad0..822e0faa 100644 --- a/pkg/runner/step_factory_test.go +++ b/pkg/runner/step_factory_test.go @@ -78,5 +78,5 @@ func TestStepFactoryInvalidStep(t *testing.T) { _, err := sf.newStep(model, &RunContext{}) - assert.Error(t, err) + require.Error(t, err) } diff --git a/pkg/runner/step_test.go b/pkg/runner/step_test.go index 182de30c..6d1f0f7f 100644 --- a/pkg/runner/step_test.go +++ b/pkg/runner/step_test.go @@ -314,31 +314,31 @@ func TestIsContinueOnError(t *testing.T) { step := createTestStep(t, "name: test") continueOnError, err := isContinueOnError(context.Background(), step.getStepModel().RawContinueOnError, step, stepStageMain) assertObject.False(continueOnError) - assertObject.NoError(err) + require.NoError(t, err) // explicit true step = createTestStep(t, "continue-on-error: true") continueOnError, err = isContinueOnError(context.Background(), step.getStepModel().RawContinueOnError, step, stepStageMain) assertObject.True(continueOnError) - assertObject.NoError(err) + require.NoError(t, err) // explicit false step = createTestStep(t, "continue-on-error: false") continueOnError, err = isContinueOnError(context.Background(), step.getStepModel().RawContinueOnError, step, stepStageMain) assertObject.False(continueOnError) - assertObject.NoError(err) + require.NoError(t, err) // expression true step = createTestStep(t, "continue-on-error: ${{ 'test' == 'test' }}") continueOnError, err = isContinueOnError(context.Background(), step.getStepModel().RawContinueOnError, step, stepStageMain) assertObject.True(continueOnError) - assertObject.NoError(err) + require.NoError(t, err) // expression false step = createTestStep(t, "continue-on-error: ${{ 'test' != 'test' }}") continueOnError, err = isContinueOnError(context.Background(), step.getStepModel().RawContinueOnError, step, stepStageMain) assertObject.False(continueOnError) - assertObject.NoError(err) + require.NoError(t, err) // expression parse error step = createTestStep(t, "continue-on-error: ${{ 'test' != test }}") @@ -368,7 +368,7 @@ func TestSymlinkJoin(t *testing.T) { if entry.err == "" { require.NoError(t, err) } else { - assert.Error(t, err, entry.err) + require.Error(t, err, entry.err) } assert.Equal(t, entry.result, result) } diff --git a/pkg/schema/schema_test.go b/pkg/schema/schema_test.go index 92460cb6..c4d95b57 100644 --- a/pkg/schema/schema_test.go +++ b/pkg/schema/schema_test.go @@ -43,7 +43,7 @@ jobs: Definition: "workflow-root-strict", Schema: GetWorkflowSchema(), }).UnmarshalYAML(&node) - assert.Error(t, err) + require.Error(t, err) } func TestAdditionalFunctionsSteps(t *testing.T) { @@ -98,7 +98,7 @@ jobs: Definition: "workflow-root-strict", Schema: GetWorkflowSchema(), }).UnmarshalYAML(&node) - assert.Error(t, err) + require.Error(t, err) } func TestFailure2(t *testing.T) { @@ -115,7 +115,7 @@ jobs: Definition: "workflow-root-strict", Schema: GetWorkflowSchema(), }).UnmarshalYAML(&node) - assert.Error(t, err) + require.Error(t, err) } func TestEscape(t *testing.T) {