github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race in quota sync test

Browse Source
This commit is contained in:
Jordan Liggitt
2018-11-28 12:38:41 -05:00
parent 0f9ebe5e16
commit 713a10d276
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/controller/resourcequota/resource_quota_controller_test.go
View File

@@ -715,8 +715,17 @@ func TestSyncResourceQuota(t *testing.T) {
t.Errorf("test: %s,\nExpected actions:\n%v\n but got:\n%v\nDifference:\n%v", testName, testCase.expectedActionSet, actionSet, testCase.expectedActionSet.Difference(actionSet)) t.Errorf("test: %s,\nExpected actions:\n%v\n but got:\n%v\nDifference:\n%v", testName, testCase.expectedActionSet, actionSet, testCase.expectedActionSet.Difference(actionSet))
} }
lastActionIndex := len(kubeClient.Actions()) - 1 var usage *v1.ResourceQuota
usage := kubeClient.Actions()[lastActionIndex].(core.UpdateAction).GetObject().(*v1.ResourceQuota) actions := kubeClient.Actions()
for i := len(actions) - 1; i >= 0; i-- {
if updateAction, ok := actions[i].(core.UpdateAction); ok {
usage = updateAction.GetObject().(*v1.ResourceQuota)
break
}
}
if usage == nil {
t.Errorf("test: %s,\nExpected update action usage, got none: actions:\n%v", testName, actions)
}
// ensure usage is as expected // ensure usage is as expected
if len(usage.Status.Hard) != len(testCase.status.Hard) { if len(usage.Status.Hard) != len(testCase.status.Hard) {