tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2023-04-24 12:54:15 -04:00 committed by Guillaume Lours
parent 5eaafe4237
commit 1383ab09ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/e2e/build_test.go
View File

@ -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",
})
}