From 14901335c102b0bc5fd9ea21daf6a930d3be3a62 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 8 Mar 2022 18:05:30 +0200 Subject: [PATCH] Increase wait timeout for TestDaemonRestart Windows needs a bit more time to finish the restarting containerd. With the current 2 second timeout, we run the risk of exceeding that deadline. Signed-off-by: Gabriel Adrian Samfira --- integration/client/container_test.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ed93bc2f1..1a6f0d7cd 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -2036,7 +2036,12 @@ func TestDaemonRestart(t *testing.T) { if err != nil { t.Fatal(err) } - defer task.Delete(ctx) + + defer func() { + if _, err := task.Delete(ctx, WithProcessKill); err != nil { + t.Logf("failed to delete task: %v", err) + } + }() statusC, err := task.Wait(ctx) if err != nil { @@ -2058,7 +2063,10 @@ func TestDaemonRestart(t *testing.T) { t.Errorf(`first task.Wait() should have failed with "transport is closing"`) } - waitCtx, waitCancel := context.WithTimeout(ctx, 2*time.Second) + // NOTE(gabriel-samfira): Windows needs a bit more time to restart. + // Increase timeout from 2 seconds to 10 seconds to avoid deadline + // exceeded errors. + waitCtx, waitCancel := context.WithTimeout(ctx, 10*time.Second) serving, err := client.IsServing(waitCtx) waitCancel() if !serving { @@ -2479,8 +2487,8 @@ func TestContainerUsername(t *testing.T) { } <-statusC if _, err := task.Delete(ctx); err != nil { - t.Fatal(err) - } + t.Fatal(err) + } output := strings.TrimSuffix(buf.String(), newLine) if output != expectedOutput {