Merge pull request #45151 from liggitt/async-token

Automatic merge from submit-queue Wait for controller events in resource conflict test Fixes #45137 same fix as #44996, missed that there was a second test involving resource conflicts

Merge pull request #45151 from liggitt/async-token
19d1d76b · Kubernetes Submit Queue · GitHub · 55e552d2 · 24efb373 · 19d1d76b
Commit 19d1d76b authored Apr 29, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

tokens_controller_test.go pkg/controller/serviceaccount/tokens_controller_test.go +3 -0

No files found.
--- a/pkg/controller/serviceaccount/tokens_controller_test.go
+++ b/pkg/controller/serviceaccount/tokens_controller_test.go
@@ -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": {