소스 검색

Merge pull request #568 from docker/ecs_e2e_down

Wait only for the first “DELETE_COMPLETE” line when running `docker compose down`
Guillaume Tardif 5 년 전
부모
커밋
217da21514
1개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 11 1
      tests/ecs-e2e/e2e-ecs_test.go

+ 11 - 1
tests/ecs-e2e/e2e-ecs_test.go

@@ -116,7 +116,17 @@ func TestCompose(t *testing.T) {
 	})
 
 	t.Run("compose down", func(t *testing.T) {
-		c.RunDockerCmd("compose", "down", "--project-name", stack, "-f", "../composefiles/nginx.yaml")
+		cmd := c.NewDockerCmd("compose", "down", "--project-name", stack)
+		res := icmd.StartCmd(cmd)
+
+		checkUp := func(t poll.LogT) poll.Result {
+			out := res.Stdout()
+			if !strings.Contains(out, "DELETE_COMPLETE") {
+				return poll.Continue("current status \n%s\n", out)
+			}
+			return poll.Success()
+		}
+		poll.WaitOn(t, checkUp, poll.WithDelay(2*time.Second), poll.WithTimeout(60*time.Second))
 	})
 }