tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 14:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10829 from milas/e2e-watch-test-fix

Browse Source 
test: watch e2e reliability tweaks
This commit is contained in:
Guillaume Lours 2023-07-19 12:07:10 +02:00 committed by GitHub
commit 150b88ab5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/e2e/watch_test.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"sync/atomic" "sync/atomic"
"testing" "testing"
@ -33,6 +34,10 @@ import (
) )
func TestWatch(t *testing.T) { func TestWatch(t *testing.T) {
if runtime.GOOS == "darwin" {
t.Skip("Test currently broken on macOS due to symlink issues (see compose-go#436)")
}
services := []string{"alpine", "busybox", "debian"} services := []string{"alpine", "busybox", "debian"}
for _, svcName := range services { for _, svcName := range services {
t.Run(svcName, func(t *testing.T) { t.Run(svcName, func(t *testing.T) {
@ -63,7 +68,7 @@ func doTest(t *testing.T, svcName string) {
"COMPOSE_PROJECT_NAME=" + projName, "COMPOSE_PROJECT_NAME=" + projName,
} }
cli := NewParallelCLI(t, WithEnv(env...)) cli := NewCLI(t, WithEnv(env...))
cleanup := func() { cleanup := func() {
cli.RunDockerComposeCmd(t, "down", svcName, "--timeout=0", "--remove-orphans", "--volumes") cli.RunDockerComposeCmd(t, "down", svcName, "--timeout=0", "--remove-orphans", "--volumes")