scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter informer actions when inspecting controller unit test reactions

Browse Source
This commit is contained in:
deads2k
2016-10-11 13:12:58 -04:00
parent ead65fc25f
commit 2ad0fbd99a
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/controller/deployment/deployment_controller_test.go
View File

@@ -193,20 +193,9 @@ func (f *fixture) run(deploymentName string) {
f.t.Errorf("error syncing deployment: %v", err) f.t.Errorf("error syncing deployment: %v", err)
} }
actions := f.client.Actions() actions := filterInformerActions(f.client.Actions())
informerActions := 0 informerActions := 0
for i, action := range actions { for i, action := range actions {
if len(action.GetNamespace()) == 0 &&
(action.Matches("list", "pods") ||
action.Matches("list", "replicasets") ||
action.Matches("list", "deployments") ||
action.Matches("watch", "pods") ||
action.Matches("watch", "replicasets") ||
action.Matches("watch", "deployments")) {
informerActions++
continue
}
if len(f.actions)+informerActions < i+1 { if len(f.actions)+informerActions < i+1 {
f.t.Errorf("%d unexpected actions: %+v", len(actions)-len(f.actions), actions[i:]) f.t.Errorf("%d unexpected actions: %+v", len(actions)-len(f.actions), actions[i:])
break break
@@ -275,8 +264,26 @@ func TestDeploymentController_dontSyncDeploymentsWithEmptyPodSelector(t *testing
if len(fake.Actions()) == 0 { if len(fake.Actions()) == 0 {
return return
} }
for _, action := range fake.Actions() { for _, action := range filterInformerActions(fake.Actions()) {
t.Logf("unexpected action: %#v", action) t.Logf("unexpected action: %#v", action)
} }
t.Errorf("expected deployment controller to not take action") t.Errorf("expected deployment controller to not take action")
} }
func filterInformerActions(actions []core.Action) []core.Action {
ret := []core.Action{}
for _, action := range actions {
if len(action.GetNamespace()) == 0 &&
(action.Matches("list", "pods") ||
action.Matches("list", "deployments") ||
action.Matches("list", "replicasets") ||
action.Matches("watch", "pods") ||
action.Matches("watch", "deployments") ||
action.Matches("watch", "replicasets")) {
continue
}
ret = append(ret, action)
}
return ret
}