From e1ab1049ed836df65054c2690c4ca3daf88f610e Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Sat, 12 Nov 2022 17:57:02 -0300 Subject: [PATCH] test: fix broken test Signed-off-by: Carlos A Becker --- internal/pipe/docker/docker_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/pipe/docker/docker_test.go b/internal/pipe/docker/docker_test.go index 020d4037719..56115f5d6a6 100644 --- a/internal/pipe/docker/docker_test.go +++ b/internal/pipe/docker/docker_test.go @@ -271,15 +271,16 @@ func TestRunPipe(t *testing.T) { extraPrepare: func(t *testing.T, ctx *context.Context) { t.Helper() for _, cmd := range []string{ - fmt.Sprintf("docker manifest rm %sgoreleaser/test_multiarch:2test ", registry), + fmt.Sprintf("docker manifest rm %sgoreleaser/test_multiarch:2test || true", registry), fmt.Sprintf("docker build -t %sgoreleaser/dummy:v1 --platform linux/amd64 -f testdata/Dockerfile.dummy .", registry), fmt.Sprintf("docker push %sgoreleaser/dummy:v1", registry), fmt.Sprintf("docker manifest create %sgoreleaser/test_multiarch:2test --amend %sgoreleaser/dummy:v1 --insecure", registry, registry), } { - // t.Log("running", cmd) - parts := strings.Fields(cmd) + parts := strings.Fields(strings.TrimSuffix(cmd, " || true")) out, err := exec.CommandContext(ctx, parts[0], parts[1:]...).CombinedOutput() - require.NoError(t, err, cmd+": "+string(out)) + if !strings.HasSuffix(cmd, " || true") { + require.NoError(t, err, cmd+": "+string(out)) + } } }, },