Skip to content

Commit

Permalink
Merge pull request kubernetes#45151 from liggitt/async-token
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Wait for controller events in resource conflict test

Fixes kubernetes#45137 

same fix as kubernetes#44996, missed that there was a second test involving resource conflicts
  • Loading branch information
Kubernetes Submit Queue authored Apr 30, 2017
2 parents 55e552d + 24efb37 commit 19d1d76
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkg/controller/serviceaccount/tokens_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,13 @@ func TestTokenCreation(t *testing.T) {
},
"new serviceaccount with no secrets with resource conflict": {
ClientObjects: []runtime.Object{updatedServiceAccount(emptySecretReferences()), createdTokenSecret()},
IsAsync: true,
MaxRetries: 1,

AddedServiceAccount: serviceAccount(emptySecretReferences()),
ExpectedActions: []core.Action{
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
},
},
"updated serviceaccount with no secrets": {
Expand Down

0 comments on commit 19d1d76

Please sign in to comment.