Merge pull request #2096 from brendandburns/master

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

View File

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