test: improve brittle tests

goreleaser · Nov 30, 2023 · 1ec5245 · 1ec5245
1 parent bd7933d
commit 1ec5245
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/internal/pipe/before/before_test.go b/internal/pipe/before/before_test.go
@@ -54,18 +54,19 @@ func TestRunPipeInvalidCommand(t *testing.T) {
 }
 
 func TestRunPipeFail(t *testing.T) {
-	for err, tc := range map[string][]string{
-		"hook failed: shell: 'go tool foobar': exit status 2: go: no such tool \"foobar\"\n": {"go tool foobar"},
-		"hook failed: shell: 'sh ./testdata/foo.sh': exit status 1: lalala\n":                {"sh ./testdata/foo.sh"},
+	for _, tc := range []string{
+		"go tool foobar",
+		"sh ./testdata/foo.sh",
 	} {
 		ctx := testctx.NewWithCfg(
 			config.Project{
 				Before: config.Before{
-					Hooks: tc,
+					Hooks: []string{tc},
 				},
 			},
 		)
-		require.EqualError(t, Pipe{}.Run(ctx), err)
+		err := Pipe{}.Run(ctx)
+		require.Contains(t, err.Error(), "hook failed")
 	}
 }
 

diff --git a/internal/pipe/build/build_test.go b/internal/pipe/build/build_test.go
@@ -747,6 +747,8 @@ func TestRunHookFailWithLogs(t *testing.T) {
 		},
 	}
 	ctx := testctx.NewWithCfg(config, testctx.WithCurrentTag("2.4.5"))
-	require.EqualError(t, Pipe{}.Run(ctx), "pre hook failed: failed to run 'sh -c echo foo; exit 1': exit status 1")
+	err := Pipe{}.Run(ctx)
+	require.ErrorIs(t, err, exec.ErrNotFound)
+	require.Contains(t, err.Error(), "pre hook failed")
 	require.Empty(t, ctx.Artifacts.List())
 }