github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5157 from AkihiroSuda/deflake-TestRestartMonitor

Browse Source 
deflake TestRestartMonitor
This commit is contained in:
Phil Estes 2021-03-11 09:04:34 -05:00 committed by GitHub
commit 8634cd9dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
restart_monitor_linux_test.go
View File

@ -82,16 +82,20 @@ version = 2
deadline := begin.Add(interval).Add(epsilon) deadline := begin.Add(interval).Add(epsilon)
for time.Now().Before(deadline) { for time.Now().Before(deadline) {
status, err := task.Status(ctx) status, err := task.Status(ctx)
now := time.Now()
if err != nil { if err != nil {
t.Fatal(err) // ErrNotFound is expected here, because the restart monitor
} // temporarily removes the task before restarting.
t.Logf("%v: status=%q", time.Now(), status) t.Logf("%v: err=%v", now, err)
} else {
t.Logf("%v: status=%q", now, status)
if status.Status == Running { if status.Status == Running {
elapsed := time.Since(begin) elapsed := time.Since(begin)
t.Logf("the task was restarted after %s", elapsed.String()) t.Logf("the task was restarted within %s", elapsed.String())
return return
} }
}
time.Sleep(epsilon) time.Sleep(epsilon)
} }
t.Fatalf("the task was not restarted in %s + %s", t.Fatalf("the task was not restarted in %s + %s",