mirror of
https://github.com/docker/compose.git
synced 2025-07-22 21:24:38 +02:00
Merge pull request #10829 from milas/e2e-watch-test-fix
test: watch e2e reliability tweaks
This commit is contained in:
commit
150b88ab5d
@ -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")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user