kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers/docker: fix flaky image coordinator test

Browse Source 
The test assertion that we don't have a delete future remaining races with the
code its testing, because the removal of the image and the removal of the
future are not atomic. Move this assertion into a `WaitForResult` to avoid
test flakes which we're seeing on CI on Windows in particular.
This commit is contained in:
Tim Gross
2021-03-31 14:43:37 -04:00
parent 46b335d652
commit f7263f6e3c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/docker/coordinator_test.go
View File

@@ -168,11 +168,15 @@ func TestDockerCoordinator_Pull_Remove(t *testing.T) {
})
// Make sure there is no future still
coordinator.imageLock.Lock()
if _, ok := coordinator.deleteFuture[id]; ok {
t.Fatal("Got delete future")
}
coordinator.imageLock.Unlock()
testutil.WaitForResult(func() (bool, error) {
coordinator.imageLock.Lock()
defer coordinator.imageLock.Unlock()
_, ok := coordinator.deleteFuture[id]
return !ok, fmt.Errorf("got delete future")
}, func(err error) {
t.Fatalf("err: %v", err)
})
}
func TestDockerCoordinator_Remove_Cancel(t *testing.T) {