From 1383ab09ec39f4a4a6c4184f9d7a5f42af8d1a46 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Mon, 24 Apr 2023 12:54:15 -0400 Subject: [PATCH] test: fix E2E tests under Engine v23 / DD 4.19 Some error messages have been tweaked slightly, this adapts the assertions to work on both Engine v20.10.x and v23.x. Signed-off-by: Milas Bowman --- pkg/e2e/build_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/e2e/build_test.go b/pkg/e2e/build_test.go index c24719255..3d1315e27 100644 --- a/pkg/e2e/build_test.go +++ b/pkg/e2e/build_test.go @@ -167,7 +167,7 @@ func TestBuildSSH(t *testing.T) { "wrong-ssh=./fixtures/build-test/ssh/fake_rsa") res.Assert(t, icmd.Expected{ ExitCode: 17, - Err: "failed to solve: rpc error: code = Unknown desc = unset ssh forward key fake-ssh", + Err: "unset ssh forward key fake-ssh", }) }) @@ -229,7 +229,7 @@ func TestBuildImageDependencies(t *testing.T) { cli.RunDockerComposeCmd(t, "down", "--rmi=all", "-t=0") res := cli.RunDockerOrExitError(t, "image", "rm", "build-dependencies-service") if res.Error != nil { - require.Contains(t, res.Stderr(), `Error: No such image: build-dependencies-service`) + require.Contains(t, res.Stderr(), `No such image: build-dependencies-service`) } } resetState() @@ -239,7 +239,7 @@ func TestBuildImageDependencies(t *testing.T) { res := cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service") res.Assert(t, icmd.Expected{ ExitCode: 1, - Err: "Error: No such image: build-dependencies-service", + Err: "No such image: build-dependencies-service", }) res = cli.RunDockerComposeCmd(t, "build") @@ -256,7 +256,7 @@ func TestBuildImageDependencies(t *testing.T) { res = cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service") res.Assert(t, icmd.Expected{ ExitCode: 1, - Err: "Error: No such image: build-dependencies-service", + Err: "No such image: build-dependencies-service", }) }