You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2023/01/24 11:49:12 UTC
[camel-k] 04/08: chore(test): improve knative kamelet binding test
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c9776e11e4371429e8163f52ecab10dc8bab633a
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Jan 19 14:55:03 2023 +0100
chore(test): improve knative kamelet binding test
I've removed some expectation as based on timing an likely to randomly
fail.
---
e2e/global/knative/kamelet_test.go | 22 ++++------------------
e2e/support/test_support.go | 7 +++++++
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/e2e/global/knative/kamelet_test.go b/e2e/global/knative/kamelet_test.go
index 420a791a4..811149ccb 100644
--- a/e2e/global/knative/kamelet_test.go
+++ b/e2e/global/knative/kamelet_test.go
@@ -42,6 +42,7 @@ func TestKameletChange(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-kamelet-change"
timerSource := "my-timer-source"
+
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Expect(CreateTimerKamelet(ns, timerSource)()).To(Succeed())
Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
@@ -66,22 +67,15 @@ func TestKameletChange(t *testing.T) {
"trait.camel.apache.org/health.readiness-initial-delay": "10",
}
+ // Create the KameletBinding
Expect(BindKameletTo(ns, timerBinding, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
- Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
- WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentProgressingReason)),
- WithTransform(KameletBindingConditionMessage, Or(
- Equal("0/1 updated replicas"),
- Equal("0/1 ready replicas"),
- ))))
-
Eventually(IntegrationPodPhase(ns, timerBinding), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
+ WithTransform(KameletBindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(KameletBindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
))
@@ -89,21 +83,13 @@ func TestKameletChange(t *testing.T) {
// Update the KameletBinding
Expect(BindKameletTo(ns, "timer-binding", annotations, from, to, map[string]string{"message": "message is Hi"}, map[string]string{})()).To(Succeed())
- Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
- WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentProgressingReason)),
- WithTransform(KameletBindingConditionMessage, Or(
- Equal("0/1 updated replicas"),
- Equal("0/1 ready replicas"),
- ))))
-
Eventually(IntegrationPodPhase(ns, "timer-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).
Should(And(
+ WithTransform(KameletBindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(KameletBindingConditionMessage, Equal("1/1 ready replicas")),
))
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index c5f041e7c..0030cacc3 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1089,6 +1089,13 @@ func KameletBindingCondition(ns string, name string, conditionType v1alpha1.Kame
}
}
+func KameletBindingConditionStatusExtract(c *v1alpha1.KameletBindingCondition) corev1.ConditionStatus {
+ if c == nil {
+ return ""
+ }
+ return c.Status
+}
+
func KameletBindingConditionReason(c *v1alpha1.KameletBindingCondition) string {
if c == nil {
return ""