You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2022/08/22 10:52:43 UTC
[camel-k] 13/13: fix(e2e): Increase Pod deletion timeout
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d646fc6df6a4623042f5586d1874b4d750daa55a
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Aug 19 17:52:16 2022 +0200
fix(e2e): Increase Pod deletion timeout
---
e2e/namespace/install/cli/delete_test.go | 14 +++++++-------
e2e/namespace/install/cli/dev_mode_test.go | 2 +-
e2e/namespace/install/cli/uninstall_test.go | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/e2e/namespace/install/cli/delete_test.go b/e2e/namespace/install/cli/delete_test.go
index c057fab79..e453a304b 100644
--- a/e2e/namespace/install/cli/delete_test.go
+++ b/e2e/namespace/install/cli/delete_test.go
@@ -42,14 +42,14 @@ func TestKamelCLIDelete(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
})
t.Run("delete building integration", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "../files/yaml.yaml").Execute()).To(Succeed())
Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
})
t.Run("delete integration from csv", func(t *testing.T) {
@@ -57,7 +57,7 @@ func TestKamelCLIDelete(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
})
t.Run("delete several integrations", func(t *testing.T) {
@@ -67,10 +67,10 @@ func TestKamelCLIDelete(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
Expect(Kamel("delete", "java", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "java"), TestTimeoutMedium).Should(BeNil())
})
t.Run("delete all integrations", func(t *testing.T) {
@@ -80,9 +80,9 @@ func TestKamelCLIDelete(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "java"), TestTimeoutMedium).Should(BeNil())
})
})
}
diff --git a/e2e/namespace/install/cli/dev_mode_test.go b/e2e/namespace/install/cli/dev_mode_test.go
index 289af3697..dc3cc5f38 100644
--- a/e2e/namespace/install/cli/dev_mode_test.go
+++ b/e2e/namespace/install/cli/dev_mode_test.go
@@ -186,7 +186,7 @@ func TestRunDevMode(t *testing.T) {
Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutMedium).Should(BeNil())
// Second run (rebuild)
ctx, cancel := context.WithCancel(TestContext)
diff --git a/e2e/namespace/install/cli/uninstall_test.go b/e2e/namespace/install/cli/uninstall_test.go
index 73ce91c84..abf03749f 100644
--- a/e2e/namespace/install/cli/uninstall_test.go
+++ b/e2e/namespace/install/cli/uninstall_test.go
@@ -44,7 +44,7 @@ func TestBasicUninstall(t *testing.T) {
Eventually(RoleBinding(ns)).Should(BeNil())
Eventually(Configmap(ns, "camel-k-maven-settings")).Should(BeNil())
Eventually(ServiceAccount(ns, "camel-k-operator")).Should(BeNil())
- Eventually(OperatorPod(ns)).Should(BeNil())
+ Eventually(OperatorPod(ns), TestTimeoutMedium).Should(BeNil())
Eventually(KameletList(ns)).Should(BeEmpty())
})
}