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

Merge pull request #10402 from milas/fix-e2e-race 

test: fix race in e2e build test
This commit is contained in:
Milas Bowman 2023-03-24 10:44:54 -04:00 committed by GitHub
parent 72260d615d 36625ed229
commit f0bf4fca76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/e2e/build_test.go
View File

@ -257,7 +257,7 @@ func TestBuildImageDependencies(t *testing.T) {
} }
t.Run("ClassicBuilder", func(t *testing.T) { t.Run("ClassicBuilder", func(t *testing.T) {
cli := NewParallelCLI(t, WithEnv( cli := NewCLI(t, WithEnv(
"DOCKER_BUILDKIT=0", "DOCKER_BUILDKIT=0",
"COMPOSE_FILE=./fixtures/build-dependencies/compose.yaml", "COMPOSE_FILE=./fixtures/build-dependencies/compose.yaml",
)) ))
@ -265,7 +265,7 @@ func TestBuildImageDependencies(t *testing.T) {
}) })
t.Run("BuildKit", func(t *testing.T) { t.Run("BuildKit", func(t *testing.T) {
cli := NewParallelCLI(t, WithEnv( cli := NewCLI(t, WithEnv(
"DOCKER_BUILDKIT=1", "DOCKER_BUILDKIT=1",
"COMPOSE_FILE=./fixtures/build-dependencies/compose.yaml", "COMPOSE_FILE=./fixtures/build-dependencies/compose.yaml",
)) ))