This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b8559713d0411df7c6bb8235a744ac72a08d2a34
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Wed Feb 22 15:41:31 2023 +0100
fix(e2e): common wf fixes
---
e2e/common/cli/describe_test.go | 2 +-
e2e/common/cli/run_test.go | 4 ++--
e2e/common/misc/kamelet_update_test.go | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index c9d4edf28..788806883 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -71,7 +71,7 @@ func TestKamelCliDescribe(t *testing.T) {
t.Run("Test kamel describe integration platform", func(t *testing.T) {
platform := GetOutputString(Kamel("describe", "platform",
operatorID, "-n", ns))
- Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s",
operatorID)))
+ Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s",
operatorID)))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns + ".*")
Expect(platform).To(MatchRegexp(r.String()))
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index f0105b228..235c856e7 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -148,7 +148,7 @@ func TestKamelCLIRun(t *testing.T) {
if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
t.Skip("WARNING: Test marked as problematic ...
skipping")
}
- Expect(KamelRunWithID(operatorID, ns,
"../../../global/common/traits/files/jvm/Classpath.java",
+ Expect(KamelRunWithID(operatorID, ns,
"../traits/files/jvm/Classpath.java",
"-d", sampleJar,
).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "classpath"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -167,7 +167,7 @@ func TestKamelCLIRun(t *testing.T) {
if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
t.Skip("WARNING: Test marked as problematic ...
skipping")
}
- Expect(KamelRunWithID(operatorID, ns,
"../../../global/common/traits/files/jvm/Classpath.java",
+ Expect(KamelRunWithID(operatorID, ns,
"../traits/files/jvm/Classpath.java",
"-d", sampleJar,
"-d",
"https://raw.githubusercontent.com/apache/camel-k/main/e2e/namespace/install/cli/files/Java.java|targetPath=/tmp/foo",
).Execute()).To(Succeed())
diff --git a/e2e/common/misc/kamelet_update_test.go
b/e2e/common/misc/kamelet_update_test.go
index b5542e296..79830763e 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -37,10 +37,10 @@ const customLabel = "custom-label"
func TestBundleKameletUpdate(t *testing.T) {
RegisterTestingT(t)
- Expect(createBundleKamelet(ns, "http-sink")()).To(Succeed()) // Going
to be replaced
- Expect(createUserKamelet(ns, "user-sink")()).To(Succeed()) // Left
intact by the operator
+ Expect(createBundleKamelet(ns, "my-http-sink")()).To(Succeed()) //
Going to be replaced
+ Expect(createUserKamelet(ns, "user-sink")()).To(Succeed()) // Left
intact by the operator
- Eventually(Kamelet("http-sink", ns)).
+ Eventually(Kamelet("my-http-sink", ns)).
Should(WithTransform(KameletLabels,
HaveKeyWithValue(customLabel, "true")))
Consistently(Kamelet("user-sink", ns), 5*time.Second, 1*time.Second).
Should(WithTransform(KameletLabels,
HaveKeyWithValue(customLabel, "true")))
