From dac056fe7497157005c6b506b72bea731ccf7e9a Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Wed, 8 Nov 2023 23:35:55 +0800 Subject: [PATCH] integration: deflake TestIssue9103 Fixes: #9334 Signed-off-by: Wei Fu --- integration/client/container_linux_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 1c50be27be6d..6ce727f3db9f 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -1447,6 +1447,7 @@ func TestIssue9103(t *testing.T) { for idx, tc := range []struct { desc string cntrOpts []NewContainerOpts + bakingFn func(ctx context.Context, t *testing.T, task Task) expectedStatus ProcessStatus }{ { @@ -1456,6 +1457,7 @@ func TestIssue9103(t *testing.T) { withProcessArgs("sleep", "30"), ), }, + bakingFn: func(context.Context, *testing.T, Task) {}, expectedStatus: Created, }, { @@ -1471,6 +1473,17 @@ func TestIssue9103(t *testing.T) { BinaryName: "runc-fp", }), }, + bakingFn: func(ctx context.Context, t *testing.T, task Task) { + waitCh, err := task.Wait(ctx) + require.NoError(t, err) + + select { + case <-time.After(30 * time.Second): + t.Fatal("timeout") + case e := <-waitCh: + require.NoError(t, e.Error()) + } + }, expectedStatus: Stopped, }, } { @@ -1490,6 +1503,8 @@ func TestIssue9103(t *testing.T) { defer task.Delete(ctx, WithProcessKill) + tc.bakingFn(ctx, t, task) + status, err := task.Status(ctx) require.NoError(t, err) require.Equal(t, tc.expectedStatus, status.Status)