Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -299,15 +299,15 @@ 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.
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.
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/taskspawner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
Loading