Skip to content

Commit 666f5d9

Browse files
AnilAltinaygvisor-bot
authored andcommitted
Fix attempt for flakiness of testDockerComposeRun
Make sure that docker compose completed successfully before checking it's output PiperOrigin-RevId: 862811154
1 parent 6b63320 commit 666f5d9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

test/image/image_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,11 @@ func testDockerComposeRun(ctx context.Context, t *testing.T, d *dockerutil.Conta
787787
if err != nil {
788788
t.Fatalf("docker compose run failed: %v", err)
789789
}
790+
waitCtx, cancel := context.WithTimeout(ctx, defaultWait)
791+
defer cancel()
792+
if status, err := execProc.WaitExitStatus(waitCtx); err != nil || status != 0 {
793+
t.Fatalf("docker compose run exited with error: %v, status: %d, docker logs: %v", err, status, dockerLogs(ctx, d))
794+
}
790795
output, err := execProc.Logs()
791796
if err != nil {
792797
t.Fatalf("docker logs failed: %v", err)

0 commit comments

Comments
 (0)