This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 72c72302be041d5d5e33dadf6da9da8550b30b40
Author: Tadayoshi Sato <sato.tadayo...@gmail.com>
AuthorDate: Fri Jul 15 17:08:16 2022 +0900
chore(e2e): reuse namespace for e2e/global/knative
---
e2e/global/knative/knative_test.go | 163 ++++++++++++++++---------------------
1 file changed, 72 insertions(+), 91 deletions(-)
diff --git a/e2e/global/knative/knative_test.go
b/e2e/global/knative/knative_test.go
index b95bafb32..9185ddf43 100644
--- a/e2e/global/knative/knative_test.go
+++ b/e2e/global/knative/knative_test.go
@@ -35,107 +35,88 @@ import (
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
-func TestRunServiceCombo(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knative2.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knative2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "knative2",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Expect(KamelRunWithID(operatorID, ns,
"files/knative3.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knative3"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "knative3",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Expect(KamelRunWithID(operatorID, ns,
"files/knative1.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knative1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "knative1",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- // Correct logs
- Eventually(IntegrationLogs(ns, "knative1"),
TestTimeoutMedium).Should(ContainSubstring("Received from 2: Hello from
knative2"))
- Eventually(IntegrationLogs(ns, "knative1"),
TestTimeoutMedium).Should(ContainSubstring("Received from 3: Hello from
knative3"))
- // Incorrect logs
- Consistently(IntegrationLogs(ns, "knative1"),
10*time.Second).ShouldNot(ContainSubstring("Received from 2: Hello from
knative3"))
- Consistently(IntegrationLogs(ns, "knative1"),
10*time.Second).ShouldNot(ContainSubstring("Received from 3: Hello from
knative2"))
- // Clean up
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
- })
-}
-
-func TestRunChannelComboV1Beta1(t *testing.T) {
+func TestKnative(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
+ Expect(CreateKnativeChannel(ns, "words")()).To(Succeed())
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativech2.groovy").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativech1.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knativech2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "knativech1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "knativech2"),
TestTimeoutMedium).Should(ContainSubstring("Received: Hello from knativech1"))
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
- })
-}
-func TestRunChannelComboGetToPost(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativegetpost2.groovy").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativegetpost1.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knativegetpost2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "knativegetpost1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "knativegetpost2"),
TestTimeoutMedium).Should(ContainSubstring(`Received ""`))
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
- })
-}
+ t.Run("Service combo", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/knative2.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knative2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "knative2",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Expect(KamelRunWithID(operatorID, ns,
"files/knative3.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knative3"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "knative3",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Expect(KamelRunWithID(operatorID, ns,
"files/knative1.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knative1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "knative1",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ // Correct logs
+ Eventually(IntegrationLogs(ns, "knative1"),
TestTimeoutMedium).Should(ContainSubstring("Received from 2: Hello from
knative2"))
+ Eventually(IntegrationLogs(ns, "knative1"),
TestTimeoutMedium).Should(ContainSubstring("Received from 3: Hello from
knative3"))
+ // Incorrect logs
+ Consistently(IntegrationLogs(ns, "knative1"),
10*time.Second).ShouldNot(ContainSubstring("Received from 2: Hello from
knative3"))
+ Consistently(IntegrationLogs(ns, "knative1"),
10*time.Second).ShouldNot(ContainSubstring("Received from 3: Hello from
knative2"))
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
-func TestRunMultiChannelChain(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
- Expect(CreateKnativeChannel(ns, "words")()).To(Succeed())
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop3.groovy").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop2.groovy").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop1.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knativemultihop3"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "knativemultihop2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "knativemultihop1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From messages: message`))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From words: word`))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From words: transformed message`))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: word`))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From words: message`))
- Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: transformed
message`))
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
- })
-}
+ t.Run("Channel combo v1beta1", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativech2.groovy").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativech1.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knativech2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "knativech1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(ns, "knativech2"),
TestTimeoutMedium).Should(ContainSubstring("Received: Hello from knativech1"))
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
-func TestRunBroker(t *testing.T) {
- WithNewTestNamespaceWithKnativeBroker(t, func(ns string) {
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativeevt1.groovy").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/knativeevt2.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "knativeevt1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "knativeevt2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "knativeevt2"),
TestTimeoutMedium).Should(ContainSubstring("Received 1: Hello 1"))
- Eventually(IntegrationLogs(ns, "knativeevt2"),
TestTimeoutMedium).Should(ContainSubstring("Received 2: Hello 2"))
- Eventually(IntegrationLogs(ns,
"knativeevt2")).ShouldNot(ContainSubstring("Received 1: Hello 2"))
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
- })
-}
+ t.Run("Channel combo get to post", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativegetpost2.groovy").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativegetpost1.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knativegetpost2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "knativegetpost1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(ns, "knativegetpost2"),
TestTimeoutMedium).Should(ContainSubstring(`Received ""`))
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
-func TestRunFlow(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns,
"files/flow.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "flow"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "flow",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ t.Run("Multi channel chain", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop3.groovy").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop2.groovy").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativemultihop1.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knativemultihop3"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "knativemultihop2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "knativemultihop1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From messages: message`))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From words: word`))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
TestTimeoutMedium).Should(ContainSubstring(`From words: transformed message`))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: word`))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From words: message`))
+ Eventually(IntegrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: transformed
message`))
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
- t.Run("Scale to zero", func(t *testing.T) {
- Eventually(IntegrationPod(ns, "flow"),
TestTimeoutLong).Should(BeNil())
+ t.Run("Broker", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativeevt1.groovy").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
"files/knativeevt2.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "knativeevt1"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "knativeevt2"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(ns, "knativeevt2"),
TestTimeoutMedium).Should(ContainSubstring("Received 1: Hello 1"))
+ Eventually(IntegrationLogs(ns, "knativeevt2"),
TestTimeoutMedium).Should(ContainSubstring("Received 2: Hello 2"))
+ Eventually(IntegrationLogs(ns,
"knativeevt2")).ShouldNot(ContainSubstring("Received 1: Hello 2"))
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ t.Run("Flow", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
"files/flow.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "flow"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "flow",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+
+ t.Run("Scale to zero", func(t *testing.T) {
+ Eventually(IntegrationPod(ns, "flow"),
TestTimeoutLong).Should(BeNil())
+ })
+
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
})
}
