Merge pull request #5727 from dmcgowan/test-monitor-restart-grace

estesp · web-flow · commit 34fb8d896759 · 2021-07-13T16:18:57.000-04:00
Add timestamp to flaky restart monitor test
diff --git a/integration/client/restart_monitor_linux_test.go b/integration/client/restart_monitor_linux_test.go
@@ -81,7 +81,7 @@ version = 2
 	task.Kill(ctx, syscall.SIGKILL)
 	begin := time.Now()
 	deadline := begin.Add(interval).Add(epsilon)
-	for time.Now().Before(deadline) {
+	for {
 		status, err := task.Status(ctx)
 		now := time.Now()
 		if err != nil {
@@ -97,10 +97,13 @@ version = 2
 				return
 			}
 		}
+		if time.Now().After(deadline) {
+			break
+		}
 		time.Sleep(epsilon)
 	}
-	t.Fatalf("the task was not restarted in %s + %s",
-		interval.String(), epsilon.String())
+	t.Fatalf("%v: the task was not restarted in %s + %s",
+		time.Now(), interval.String(), epsilon.String())
 }
 
 // withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus.

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ version = 2`
`81`	`81`	`task.Kill(ctx, syscall.SIGKILL)`
`82`	`82`	`begin := time.Now()`
`83`	`83`	`deadline := begin.Add(interval).Add(epsilon)`
`84`		`- for time.Now().Before(deadline) {`
	`84`	`+ for {`
`85`	`85`	`status, err := task.Status(ctx)`
`86`	`86`	`now := time.Now()`
`87`	`87`	`if err != nil {`
`@@ -97,10 +97,13 @@ version = 2`
`97`	`97`	`return`
`98`	`98`	`}`
`99`	`99`	`}`
	`100`	`+ if time.Now().After(deadline) {`
	`101`	`+ break`
	`102`	`+ }`
`100`	`103`	`time.Sleep(epsilon)`
`101`	`104`	`}`
`102`		`- t.Fatalf("the task was not restarted in %s + %s",`
`103`		`- interval.String(), epsilon.String())`
	`105`	`+ t.Fatalf("%v: the task was not restarted in %s + %s",`
	`106`	`+ time.Now(), interval.String(), epsilon.String())`
`104`	`107`	`}`
`105`	`108`
`106`	`109`	`// withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus.`