From 32e0da39fc8978aa712cef75dc635abf9b70b7a8 Mon Sep 17 00:00:00 2001
From: Caleb Woodbine <caleb@ii.coop>
Date: Thu, 21 May 2020 15:58:55 +1200
Subject: [PATCH] Update to use watcher

---
 test/e2e/framework/util.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index 8f16a9a3bfc..7e957769ae2 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -1286,12 +1286,9 @@ func taintExists(taints []v1.Taint, taintToFind *v1.Taint) bool {
 	return false
 }
 
-func getDynamicResourceWatch(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions) func() (watch.Interface, error) {
-	return func() (watch.Interface, error) {
-		res, err := dc.Resource(resourceType).Namespace(namespace).Watch(context.TODO(), listOptions)
-		ExpectNoError(err, "Failed to create a watch for %v", resourceType.Resource)
-		return res, err
-	}
+func getDynamicResourceWatch(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, listOptions metav1.ListOptions) (watch.Interface, error) {
+	res, err := dc.Resource(resourceType).Namespace(namespace).Watch(context.TODO(), listOptions)
+	return res, err
 }
 
 // WatchEventEnsurerAndManager
@@ -1305,10 +1302,20 @@ func getDynamicResourceWatch(testContext context.Context, dc dynamic.Interface,
 //   expectedWatchEvents array of events which are expected to occur
 //   scenario            the function to run
 func WatchEventEnsurerAndManager(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions, expectedWatchEvents []watch.Event, scenario func(*watch.Interface) []watch.Event) {
-	// TODO add client-go/tools/watch/retrywatcher to manage watch restarts
+	listWatcher := &cache.ListWatch{
+		WatchFunc: func(listOptions metav1.ListOptions) (watch.Interface, error) {
+			return getDynamicResourceWatch(testContext, dc, resourceType, namespace, listOptions)
+		},
+	}
+	resourceWatch, err := watchtools.NewRetryWatcher("", listWatcher)
+	ExpectNoError(err, "Failed to create a resource watch of %v in namespace %v", resourceType.Resource, namespace)
+
+	ExpectNoError(err, "Failed to create a watch for %v", resourceType.Resource)
 	retries := 3
 retriesLoop:
 	for try := 1; try <= retries; try++ {
+		// TODO pass resourceWatch to the test function, or just collect events separately and parse them after
+		scenario()
 		errs := sets.NewString()
 	watchEventsLoop:
 		for watchEventIndex, _ := range expectedWatchEvents {