From 24efb3736b2a6a7654aed122f3f7d72b28a94cb1 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Sat, 29 Apr 2017 22:23:39 -0400
Subject: [PATCH] Wait for controller events in resource conflict test

---
 pkg/controller/serviceaccount/tokens_controller_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go
index 8b2b23b6047..06b9e375b40 100644
--- 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": {