Standardize polling and timeout

Author: Joshua Reed

controllers/cloudstackaffinitygroup_controller_test.go

@@ -17,8 +17,6 @@ limitations under the License.
 package controllers_test
 
 import (
-	"time"
-
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -54,6 +52,6 @@ var _ = Describe("CloudStackAffinityGroupReconciler", func() {
 				}
 			}
 			return false
-		}, timeout).WithPolling(2 * time.Second).Should(BeTrue())
+		}, timeout).WithPolling(pollInterval).Should(BeTrue())
 	})
 })

controllers/cloudstackcluster_controller_test.go

@@ -42,7 +42,7 @@ var _ = Describe("CloudStackClusterReconciler", func() {
 					return true
 				}
 				return false
-			}, timeout).Should(BeTrue())
+			}, timeout).WithPolling(pollInterval).Should(BeTrue())
 		})
 	})
 

controllers/cloudstackfailuredomain_controller_test.go

@@ -17,8 +17,6 @@ limitations under the License.
 package controllers_test
 
 import (
-	"time"
-
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -58,7 +56,7 @@ var _ = Describe("CloudStackFailureDomainReconciler", func() {
 					return tempfd.Status.Ready
 				}
 				return false
-			}, 30*time.Second).WithPolling(time.Second).Should(BeTrue())
+			}, timeout).WithPolling(pollInterval).Should(BeTrue())
 		})
 	})
 })

controllers/cloudstackisolatednetwork_controller_test.go

@@ -17,8 +17,6 @@ limitations under the License.
 package controllers_test
 
 import (
-	"time"
-
 	g "github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -46,7 +44,7 @@ var _ = Describe("CloudStackIsolatedNetworkReconciler", func() {
 					return true
 				}
 				return false
-			}, timeout).WithPolling(2 * time.Second).Should(BeTrue())
+			}, timeout).WithPolling(pollInterval).Should(BeTrue())
 		})
 	})
 })

controllers/cloudstackmachine_controller_test.go

@@ -17,8 +17,6 @@ limitations under the License.
 package controllers_test
 
 import (
-	"time"
-
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -74,7 +72,7 @@ var _ = Describe("CloudStackMachineReconciler", func() {
 					}
 				}
 				return false
-			}, 5).WithPolling(2 * time.Second).Should(BeTrue())
+			}, timeout).WithPolling(pollInterval).Should(BeTrue())
 		})
 	})
 

controllers/controllers_suite_test.go

@@ -68,7 +68,8 @@ var (
 )
 
 const (
-	timeout = time.Second * 30
+	timeout      = 10 * time.Second
+	pollInterval = 1 * time.Second
 )
 
 func envOr(envKey, defaultValue string) string {