Merge pull request containerd#6200 from bobbypage/restart_integration_test

dmcgowan · web-flow · commit 1e36eaf11fb5 · 2021-11-03T14:53:09.000-07:00
test: Add grace period for restart monitor test
diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go
@@ -174,7 +174,11 @@ version = 2
 
 	begin := time.Now()
 
-	expected := begin.Add(interval).Add(epsilon)
+	// The restart is "truly" expected after (interval + epsilon), but due to some flakiness in CI, we give it a bit extra time.
+	// Specifically, we give an extra "grace period" of (count / 2) seconds.
+	expected := begin.Add(interval).Add(epsilon * (count / 2))
+
+	// Deadline determines when check for restart should be aborted.
 	deadline := begin.Add(interval).Add(epsilon * count)
 	for {
 		status, err := task.Status(ctx)
