1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10494 from milas/e2e-dd-419

Browse Source 
test: fix E2E tests under Engine v23 / DD 4.19
This commit is contained in:
Guillaume Lours 2023-04-25 08:37:24 +02:00 committed by GitHub
commit eb0632b1d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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") "wrong-ssh=./fixtures/build-test/ssh/fake_rsa")
res.Assert(t, icmd.Expected{ res.Assert(t, icmd.Expected{
ExitCode: 17, 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") cli.RunDockerComposeCmd(t, "down", "--rmi=all", "-t=0")
res := cli.RunDockerOrExitError(t, "image", "rm", "build-dependencies-service") res := cli.RunDockerOrExitError(t, "image", "rm", "build-dependencies-service")
if res.Error != nil { 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() resetState()
@ -239,7 +239,7 @@ func TestBuildImageDependencies(t *testing.T) {
res := cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service") res := cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service")
res.Assert(t, icmd.Expected{ res.Assert(t, icmd.Expected{
ExitCode: 1, ExitCode: 1,
Err: "Error: No such image: build-dependencies-service", Err: "No such image: build-dependencies-service",
}) })
res = cli.RunDockerComposeCmd(t, "build") res = cli.RunDockerComposeCmd(t, "build")
@ -256,7 +256,7 @@ func TestBuildImageDependencies(t *testing.T) {
res = cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service") res = cli.RunDockerOrExitError(t, "image", "inspect", "build-dependencies-service")
res.Assert(t, icmd.Expected{ res.Assert(t, icmd.Expected{
ExitCode: 1, ExitCode: 1,
Err: "Error: No such image: build-dependencies-service", Err: "No such image: build-dependencies-service",
}) })
} }