Merge pull request docker#11023 from glours/fix-watch-e2e-test-cleanup

glours · web-flow · commit 75f5c07d3d30 · 2023-09-20T21:43:51.000+02:00
remove --timeout=0 flag to cleanup function of watch e2e test
diff --git a/pkg/e2e/watch_test.go b/pkg/e2e/watch_test.go
@@ -84,7 +84,7 @@ func doTest(t *testing.T, svcName string, tarSync bool) {
 
 	// important that --rmi is used to prune the images and ensure that watch builds on launch
 	cleanup := func() {
-		cli.RunDockerComposeCmd(t, "down", svcName, "--timeout=0", "--remove-orphans", "--volumes", "--rmi=local")
+		cli.RunDockerComposeCmd(t, "down", svcName, "--remove-orphans", "--volumes", "--rmi=local")
 	}
 	cleanup()
 	t.Cleanup(cleanup)

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func doTest(t *testing.T, svcName string, tarSync bool) {`
`84`	`84`
`85`	`85`	`// important that --rmi is used to prune the images and ensure that watch builds on launch`
`86`	`86`	`cleanup := func() {`
`87`		`- cli.RunDockerComposeCmd(t, "down", svcName, "--timeout=0", "--remove-orphans", "--volumes", "--rmi=local")`
	`87`	`+ cli.RunDockerComposeCmd(t, "down", svcName, "--remove-orphans", "--volumes", "--rmi=local")`
`88`	`88`	`}`
`89`	`89`	`cleanup()`
`90`	`90`	`t.Cleanup(cleanup)`