unify the default timeout

Signed-off-by: Wei Liu <liuweixa@redhat.com>

Author: skeeey

test/e2e/pkg/cert_rotation_test.go

@@ -103,7 +103,7 @@ var _ = Describe("Certificate Rotation", Ordered, Label("e2e-tests-cert-rotation
 					return fmt.Errorf("expected 1 replica, got %d", *deployment.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			By("verifying work status is reported back")
 			Eventually(func() error {
@@ -118,7 +118,7 @@ var _ = Describe("Certificate Rotation", Ordered, Label("e2e-tests-cert-rotation
 					return fmt.Errorf("work not available yet")
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		AfterAll(func() {
@@ -156,7 +156,7 @@ var _ = Describe("Certificate Rotation", Ordered, Label("e2e-tests-cert-rotation
 			By("ensuring the work is deleted")
 			Eventually(func() error {
 				return AssertWorkNotFound(workName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			By("ensuring the deployment is deleted from agent cluster")
 			Eventually(func() error {
@@ -168,7 +168,7 @@ var _ = Describe("Certificate Rotation", Ordered, Label("e2e-tests-cert-rotation
 					return err
 				}
 				return fmt.Errorf("deployment %s still exists", deployName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("should update work when certificate expires and succeed after rotation", func() {
@@ -210,7 +210,7 @@ var _ = Describe("Certificate Rotation", Ordered, Label("e2e-tests-cert-rotation
 					return fmt.Errorf("expected 2 replicas, got %d", *deployment.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 	})
 })
@@ -429,7 +429,7 @@ func restartDeployment(ctx context.Context, kubeClient kubernetes.Interface, dep
 		}
 
 		return nil
-	}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
+	}).ShouldNot(HaveOccurred())
 
 	// Give the deployment a moment to establish connections
 	time.Sleep(5 * time.Second)

test/e2e/pkg/grpc_test.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"time"
 
 	"github.com/cloudevents/sdk-go/v2/binding"
 	cetypes "github.com/cloudevents/sdk-go/v2/types"
@@ -80,7 +79,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 				}
 
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			Eventually(func() error {
 				_, err := agentTestOpts.kubeClientSet.AppsV1().Deployments("default").Get(ctx, deployName, metav1.GetOptions{})
@@ -91,7 +90,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 					return err
 				}
 				return fmt.Errorf("nginx deployment still exists")
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			_, resp, err := apiClient.DefaultAPI.ApiMaestroV1ResourceBundlesIdGet(ctx, resourceID).Execute()
 			Expect(err).To(HaveOccurred(), "Expected 404 error")
@@ -104,7 +103,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 		It("should subscribe to the resource status with grpc client", func() {
 			Eventually(func() error {
 				return assertResourceStatus(subscribedResourceStatus, resourceID, 1)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("get the deployment from cluster", func() {
@@ -117,7 +116,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 					return fmt.Errorf("unexpected replicas, expected 1, got %d", *deploy.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("get the resource via maestro api", func() {
@@ -141,7 +140,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 		It("should subscribe to the resource status with grpc client", func() {
 			Eventually(func() error {
 				return assertResourceStatus(subscribedResourceStatus, resourceID, 2)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("get the deployment from cluster", func() {
@@ -154,7 +153,7 @@ var _ = Describe("GRPC", Ordered, Label("e2e-tests-grpc"), func() {
 					return fmt.Errorf("unexpected replicas, expected 2, got %d", *deploy.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("get the resource via maestro api", func() {

test/e2e/pkg/resources_test.go

@@ -42,7 +42,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return fmt.Errorf("unexpected replicas, expected 1, got %d", *deploy.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			resourceID = string(createdWork.UID)
 			gotResource, resp, err := apiClient.DefaultAPI.ApiMaestroV1ResourceBundlesIdGet(ctx, resourceID).Execute()
@@ -66,11 +66,11 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return err
 				}
 				return fmt.Errorf("nginx deployment still exists")
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			Eventually(func() error {
 				return AssertWorkNotFound(workName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("patch the resource with source work client", func() {
@@ -120,7 +120,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return err
 				}
 				return fmt.Errorf("nginx deployment still exists")
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			Eventually(func() error {
 				_, resp, err := apiClient.DefaultAPI.ApiMaestroV1ResourceBundlesIdGet(ctx, resourceID).Execute()
@@ -131,7 +131,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return fmt.Errorf("unexpected http code, got %d, expected %d", resp.StatusCode, http.StatusNotFound)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			opIDCtx, opID = newOpIDContext(ctx)
 			By(fmt.Sprintf("create the resource again with source work client (op-id: %s)", opID))
@@ -148,7 +148,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return fmt.Errorf("unexpected replicas, expected 1, got %d", *deploy.Spec.Replicas)
 				}
 				return nil
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			// the resource id should not change
 			gotResource, resp, err := apiClient.DefaultAPI.ApiMaestroV1ResourceBundlesIdGet(ctx, resourceID).Execute()
@@ -240,12 +240,12 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 					return err
 				}
 				return fmt.Errorf("auth secret still exists")
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			By("check the resource deletion via source workclient")
 			Eventually(func() error {
 				return AssertWorkNotFound(workName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("get the resource status back", func() {
@@ -268,7 +268,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 				}
 
 				return fmt.Errorf("work status manifests are empty")
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 	})
 
@@ -293,15 +293,15 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 			By("check the resource deletion via source workclient")
 			Eventually(func() error {
 				return AssertWorkNotFound(workName)
-			}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("check the nested work is created and not updated", func() {
 			// make sure the nested work is created
 			Eventually(func() error {
 				_, err := agentTestOpts.workClientSet.WorkV1().ManifestWorks(nestedWorkNamespace).Get(ctx, nestedWorkName, metav1.GetOptions{})
 				return err
-			}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			// make sure the nested work is not updated
 			Consistently(func() error {
@@ -315,7 +315,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 				}
 
 				return nil
-			}, 1*time.Minute, 1*time.Second).Should(BeNil())
+			}).Should(BeNil())
 		})
 	})
 
@@ -342,7 +342,7 @@ var _ = Describe("Resources", Ordered, Label("e2e-tests-resources"), func() {
 
 			Eventually(func() error {
 				return AssertWorkNotFound(workName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 		})
 

test/e2e/pkg/sourceclient_test.go

@@ -80,7 +80,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 				}
 
 				return AssertWorkNotFound(initWorkBName)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			watcherCancel()
 		})
@@ -139,7 +139,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 
 			Eventually(func() error {
 				return AssertWatchResult(result)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			expectedMetrics := fmt.Sprintf(`
 			# HELP source_client_registered_watchers Number of registered watchers for a source client.
@@ -197,18 +197,18 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 
 			Eventually(func() error {
 				return AssertWatchResult(allConsumerWatcherResult)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			Eventually(func() error {
 				return AssertWatchResult(consumerWatcherResult)
-			}, 30*time.Second, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			Consistently(func() error {
 				if len(otherConsumerWatcherResult.WatchedWorks) != 0 {
 					return fmt.Errorf("unexpected watched works")
 				}
 				return nil
-			}, 10*time.Second, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			expectedMetrics := fmt.Sprintf(`
 			# HELP source_client_registered_watchers Number of registered watchers for a source client.
@@ -261,7 +261,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 
 			Eventually(func() error {
 				return AssertWatchResult(result)
-			}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			expectedMetrics := fmt.Sprintf(`
 			# HELP source_client_registered_watchers Number of registered watchers for a source client.
@@ -334,7 +334,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 					return fmt.Errorf("second watcher should have received events")
 				}
 				return nil
-			}, 30*time.Second, 1*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 
 			By("verify watchers are independent - first watcher stopped, second continues")
 			Expect(len(firstResult.WatchedWorks)).Should(BeNumerically(">", 0), "first watcher should have processed initial events")
@@ -395,7 +395,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 				}
 
 				return fmt.Errorf("no deleted work watched")
-			}, 1*time.Minute, 5*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 	})
 
@@ -491,7 +491,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 				}
 
 				return AssertWorkNotFound(testWorkCName)
-			}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
+			}).ShouldNot(HaveOccurred())
 		})
 
 		It("list works with options", func() {
@@ -789,7 +789,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 					}
 
 					return nil
-				}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+				}).ShouldNot(HaveOccurred())
 			})
 
 			By("update deploy replicas", func() {
@@ -855,7 +855,7 @@ var _ = Describe("SourceWorkClient", Ordered, Label("e2e-tests-source-work-clien
 					}
 
 					return nil
-				}, 1*time.Minute, 1*time.Second).ShouldNot(HaveOccurred())
+				}).ShouldNot(HaveOccurred())
 			})
 		})
 	})