github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2096 from brendandburns/master

Browse Source 
Fix a flaky test by draining the worker pool after syncing.
This commit is contained in:
bgrant0607 2014-10-31 10:48:05 -07:00
commit bf30e91c56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet_test.go
View File

@ -182,8 +182,8 @@ func TestSyncPodsDoesNothing(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
kubelet.drainWorkers()
verifyCalls(t, fakeDocker, []string{"list"}) verifyCalls(t, fakeDocker, []string{"list", "list", "inspect_container", "inspect_container"})
} }
// drainWorkers waits until all workers are done. Should only used for testing. // drainWorkers waits until all workers are done. Should only used for testing.