diff --git a/Makefile b/Makefile index 72bd3a69..edda7d71 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ test-integration: envtest ## Run integration tests (envtest). .PHONY: test-e2e test-e2e: ginkgo ## Run e2e tests (requires cluster and agent credentials). - $(GINKGO) -v --timeout 20m ./test/e2e/... + $(GINKGO) -v --timeout 20m -p ./test/e2e/... .PHONY: update update: controller-gen yamlfmt shfmt ## Run all generators and formatters. diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 283ab3b3..bcca005b 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -283,7 +283,7 @@ func (f *Framework) WaitForJobCompletion(name string) { } } return false - }, 5*time.Minute, 10*time.Second).Should(BeTrue()) + }, 5*time.Minute, 2*time.Second).Should(BeTrue()) } // WaitForDeploymentAvailable waits for a Deployment to reach the available condition. @@ -299,7 +299,7 @@ func (f *Framework) WaitForDeploymentAvailable(name string) { } } return false - }, 2*time.Minute, 10*time.Second).Should(BeTrue()) + }, 2*time.Minute, 2*time.Second).Should(BeTrue()) } // WaitForCronJobCreated waits for a CronJob with the given name to appear. @@ -307,7 +307,7 @@ func (f *Framework) WaitForCronJobCreated(name string) { Eventually(func() error { _, err := f.Clientset.BatchV1().CronJobs(f.Namespace).Get(context.TODO(), name, metav1.GetOptions{}) return err - }, 2*time.Minute, 10*time.Second).Should(Succeed()) + }, 2*time.Minute, 2*time.Second).Should(Succeed()) } // GetTaskPhase returns the phase of a Task. diff --git a/test/e2e/taskspawner_test.go b/test/e2e/taskspawner_test.go index d1e12020..14976c80 100644 --- a/test/e2e/taskspawner_test.go +++ b/test/e2e/taskspawner_test.go @@ -77,12 +77,12 @@ var _ = Describe("TaskSpawner", func() { By("waiting for TaskSpawner phase to become Running") Eventually(func() string { return f.GetTaskSpawnerPhase("spawner") - }, 3*time.Minute, 10*time.Second).Should(Equal("Running")) + }, 3*time.Minute, 2*time.Second).Should(Equal("Running")) By("verifying at least one Task was created") Eventually(func() []string { return f.ListTaskNames("kelos.dev/taskspawner=spawner") - }, 3*time.Minute, 10*time.Second).ShouldNot(BeEmpty()) + }, 3*time.Minute, 2*time.Second).ShouldNot(BeEmpty()) }) It("should be accessible via CLI", func() { @@ -188,12 +188,12 @@ var _ = Describe("Cron TaskSpawner", func() { By("waiting for TaskSpawner phase to become Running") Eventually(func() string { return f.GetTaskSpawnerPhase("cron-spawner") - }, 3*time.Minute, 10*time.Second).Should(Equal("Running")) + }, 3*time.Minute, 2*time.Second).Should(Equal("Running")) By("verifying at least one Task was created") Eventually(func() []string { return f.ListTaskNames("kelos.dev/taskspawner=cron-spawner") - }, 3*time.Minute, 10*time.Second).ShouldNot(BeEmpty()) + }, 3*time.Minute, 2*time.Second).ShouldNot(BeEmpty()) }) It("should be accessible via CLI with cron source info", func() {