You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cd...@apache.org on 2024/03/08 19:35:56 UTC
(camel-k) 03/10: chore(e2e): Use fresh Gomega instance for each test
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c398356108e62b4f54bead98965b4f070c0b9230
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Fri Mar 1 22:51:46 2024 +0100
chore(e2e): Use fresh Gomega instance for each test
- Recommended use of Gomega NewWithT() instead of RegisterTestingT() to get a fresh instance for each test
- Avoids concurrency errors when running tests in parallel
---
e2e/advanced/build_order_strategy_test.go | 158 ++++++------
e2e/advanced/builder_test.go | 38 +--
e2e/advanced/catalog_builder_test.go | 84 +++----
e2e/advanced/debug_test.go | 50 ++--
e2e/advanced/deployment_test.go | 22 +-
e2e/advanced/dump_test.go | 28 +--
e2e/advanced/environment_test.go | 54 ++--
e2e/advanced/incremental_build_test.go | 180 +++++++-------
e2e/advanced/integration_profile_test.go | 108 ++++----
e2e/advanced/kamelet_repo_test.go | 22 +-
e2e/advanced/local_platform_test.go | 54 ++--
e2e/advanced/maven_http_proxy_test.go | 58 ++---
e2e/advanced/operator_id_filtering_test.go | 98 ++++----
e2e/advanced/operator_metrics_test.go | 142 +++++------
e2e/advanced/platform_traits_test.go | 30 +--
e2e/advanced/promote_test.go | 124 ++++-----
e2e/advanced/reset_test.go | 60 ++---
e2e/advanced/synthetic_test.go | 87 +++----
e2e/advanced/tekton_test.go | 14 +-
e2e/builder/build_test.go | 128 +++++-----
e2e/builder/registry_test.go | 28 +--
e2e/common/cli/bind_test.go | 28 +--
e2e/common/cli/config_test.go | 18 +-
e2e/common/cli/delete_test.go | 60 ++---
e2e/common/cli/describe_test.go | 32 +--
e2e/common/cli/dev_mode_test.go | 33 ++-
e2e/common/cli/duplicate_parameters_test.go | 8 +-
e2e/common/cli/get_test.go | 34 +--
e2e/common/cli/help_test.go | 22 +-
e2e/common/cli/log_test.go | 16 +-
e2e/common/cli/offline_commands_test.go | 17 +-
e2e/common/cli/run_test.go | 152 ++++++------
e2e/common/cli/version_test.go | 4 +-
e2e/common/config/config_reload_test.go | 58 ++---
e2e/common/config/config_test.go | 242 +++++++++---------
e2e/common/config/kamelet_config_test.go | 304 +++++++++++------------
e2e/common/config/pipe_config_test.go | 116 ++++-----
e2e/common/languages/groovy_test.go | 12 +-
e2e/common/languages/java_test.go | 12 +-
e2e/common/languages/js_test.go | 12 +-
e2e/common/languages/kotlin_test.go | 12 +-
e2e/common/languages/polyglot_test.go | 14 +-
e2e/common/languages/xml_test.go | 12 +-
e2e/common/languages/yaml_test.go | 12 +-
e2e/common/misc/client_test.go | 4 +-
e2e/common/misc/cron_test.go | 44 ++--
e2e/common/misc/integration_fail_test.go | 114 ++++-----
e2e/common/misc/integration_trait_update_test.go | 14 +-
e2e/common/misc/kamelet_test.go | 18 +-
e2e/common/misc/kamelet_update_test.go | 12 +-
e2e/common/misc/maven_repository_test.go | 14 +-
e2e/common/misc/pipe_test.go | 42 ++--
e2e/common/misc/pipe_with_image_test.go | 28 +--
e2e/common/misc/registry_maven_wagon_test.go | 53 ++--
e2e/common/misc/rest_test.go | 26 +-
e2e/common/misc/scale_binding_test.go | 62 ++---
e2e/common/misc/scale_integration_test.go | 79 +++---
e2e/common/misc/structured_logs_test.go | 20 +-
e2e/common/runtimes/runtimes_test.go | 40 +--
e2e/common/setup/main_test.go | 6 +-
e2e/common/traits/affinity_test.go | 56 ++---
e2e/common/traits/builder_test.go | 206 +++++++--------
e2e/common/traits/camel_test.go | 28 +--
e2e/common/traits/container_test.go | 36 +--
e2e/common/traits/deployment_test.go | 36 +--
e2e/common/traits/error_handler_test.go | 12 +-
e2e/common/traits/errored_trait_test.go | 26 +-
e2e/common/traits/health_test.go | 144 +++++------
e2e/common/traits/istio_test.go | 26 +-
e2e/common/traits/jolokia_test.go | 30 +--
e2e/common/traits/jvm_test.go | 20 +-
e2e/common/traits/kamelet_test.go | 20 +-
e2e/common/traits/master_test.go | 36 +--
e2e/common/traits/openapi_test.go | 16 +-
e2e/common/traits/pdb_test.go | 56 ++---
e2e/common/traits/pod_test.go | 20 +-
e2e/common/traits/prometheus_test.go | 24 +-
e2e/common/traits/pull_secret_test.go | 46 ++--
e2e/common/traits/route_test.go | 74 +++---
e2e/common/traits/service_binding_test.go | 24 +-
e2e/common/traits/service_test.go | 52 ++--
e2e/common/traits/toleration_test.go | 44 ++--
e2e/install/cli/global_kamelet_test.go | 38 +--
e2e/install/cli/global_test.go | 116 +++++----
e2e/install/cli/install_test.go | 90 +++----
e2e/install/cli/maven_ca_secret_test.go | 56 ++---
e2e/install/cli/uninstall_test.go | 102 ++++----
e2e/install/helm/setup_test.go | 30 ++-
e2e/install/kustomize/operator_test.go | 70 +++---
e2e/install/kustomize/setup_test.go | 38 +--
e2e/install/kustomize/uninstall_test.go | 72 +++---
e2e/install/olm/olm_install_test.go | 34 +--
e2e/install/upgrade/cli_upgrade_test.go | 64 ++---
e2e/install/upgrade/helm_upgrade_test.go | 52 ++--
e2e/install/upgrade/olm_upgrade_test.go | 106 ++++----
e2e/knative/kamelet_test.go | 32 +--
e2e/knative/knative_platform_test.go | 40 +--
e2e/knative/knative_test.go | 146 ++++++-----
e2e/knative/openapi_test.go | 14 +-
e2e/knative/pod_test.go | 20 +-
e2e/native/native_binding_test.go | 22 +-
e2e/native/native_test.go | 84 +++----
e2e/native/native_with_sources_test.go | 66 ++---
e2e/support/test_support.go | 90 +++----
e2e/support/test_util.go | 9 +-
e2e/telemetry/telemetry_test.go | 38 +--
pkg/cmd/install.go | 9 +-
pkg/cmd/util.go | 16 +-
script/Makefile | 27 +-
109 files changed, 2935 insertions(+), 2951 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index 46111d8cb..83dcdce8c 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -37,149 +37,149 @@ import (
func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-build-order-deps"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--max-running-pipelines", "4",
"--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(t, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
integrationKitNameA := IntegrationKit(t, ns, integrationA)()
- Eventually(Build(t, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(Build(t, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:cron",
).Execute()).To(Succeed())
integrationC := RandomizedSuffixName("java-c")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationC,
"-d", "camel:cron",
"-d", "camel:zipfile",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(t, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(t, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(t, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
integrationKitNameB := IntegrationKit(t, ns, integrationB)()
integrationKitNameC := IntegrationKit(t, ns, integrationC)()
integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
-
- Eventually(BuildPhase(t, ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
-
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
buildA := Build(t, ns, integrationKitNameA)()
buildB := Build(t, ns, integrationKitNameB)()
buildC := Build(t, ns, integrationKitNameC)()
buildZ := Build(t, ns, integrationKitNameZ)()
- Expect(buildA.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
- Expect(buildA.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(buildB.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(buildZ.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
- Expect(buildZ.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildA.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildA.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildB.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildZ.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildZ.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
/*
func TestRunBuildOrderStrategyFIFO(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-build-order-fifo"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:joor",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
integrationKitNameA := IntegrationKit(t, ns, integrationA)()
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(t, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitNameB := IntegrationKit(t, ns, integrationB)()
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(t, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
-
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
*/
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index a1548812c..2ab36f8c1 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -38,14 +38,14 @@ import (
func TestBuilderTimeout(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
pl := Platform(t, ns)()
@@ -54,8 +54,8 @@ func TestBuilderTimeout(t *testing.T) {
Duration: 10 * time.Second,
}
TestClient(t).Update(TestContext, pl)
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformTimeout(t, ns)).Should(Equal(
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformTimeout(t, ns)).Should(Equal(
&metav1.Duration{
Duration: 10 * time.Second,
},
@@ -66,22 +66,22 @@ func TestBuilderTimeout(t *testing.T) {
t.Run("run yaml", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml",
"--name", name,
"-t", "builder.strategy=pod").Execute()).To(Succeed())
// As the build hits timeout, it keeps trying building
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitName := IntegrationKit(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPodPhase(t, ns, builderKitName)).Should(Equal(corev1.PodPending))
- Eventually(BuildPhase(t, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
- Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
- Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
+ g.Eventually(BuilderPodPhase(t, ns, builderKitName)).Should(Equal(corev1.PodPending))
+ g.Eventually(BuildPhase(t, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
// After a few minutes (5 max retries), this has to be in error state
- Eventually(BuildPhase(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(BuildFailureRecovery(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
- Eventually(BuilderPodPhase(t, ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
+ g.Eventually(BuildPhase(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(BuildFailureRecovery(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
+ g.Eventually(BuilderPodPhase(t, ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
})
})
}
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index e85f900ac..4279e7f75 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -38,18 +38,18 @@ import (
func TestCamelCatalogBuilder(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(t, ns, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalog(t, ns, catalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// Run an integration with a catalog not compatible
// The operator should create the catalog, but fail on reconciliation as it is not compatible
@@ -57,24 +57,24 @@ func TestCamelCatalogBuilder(t *testing.T) {
t.Run("Run catalog not compatible", func(t *testing.T) {
name := RandomizedSuffixName("java-1-15")
nonCompatibleCatalogName := "camel-catalog-1.15.0"
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version=1.15.0",
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
- Eventually(CamelCatalogCondition(t, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
+ g.Eventually(CamelCatalog(t, ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
+ g.Eventually(CamelCatalogCondition(t, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
- Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, name)()
- Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
- Eventually(KitCondition(t, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
+ g.Eventually(KitCondition(t, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
// Run an integration with a compatible catalog
@@ -85,24 +85,24 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
+ g.Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
t.Run("Run catalog container exists", func(t *testing.T) {
@@ -111,32 +111,32 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
+ g.Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
Equal("Container image tool found in catalog"),
)
- Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, name)()
- Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(IntegrationPodPhase(t, ns, name)).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(IntegrationPodPhase(t, ns, name)).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 206211aac..753d6b27c 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -39,68 +39,68 @@ import (
func TestKamelCLIDebug(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("debug local default port check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(portIsInUse("127.0.0.1", "5005")()).To(BeFalse())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(portIsInUse("127.0.0.1", "5005")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(portIsInUse("127.0.0.1", "5005"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(portIsInUse("127.0.0.1", "5005"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug local port check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(portIsInUse("127.0.0.1", "5006")()).To(BeFalse())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(portIsInUse("127.0.0.1", "5006")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "--port", "5006", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(portIsInUse("127.0.0.1", "5006"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(portIsInUse("127.0.0.1", "5006"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug logs check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Pod config test", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(func() string {
+ g.Eventually(func() string {
return IntegrationPod(t, ns, "yaml")().Spec.Containers[0].Args[0]
}).Should(ContainSubstring("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005"))
- Expect(IntegrationPod(t, ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(IntegrationPod(t, ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index 8c80f68a4..91cefb686 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -36,14 +36,14 @@ import (
func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-failing-deploy"
nsRestr := "restr"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
// Create restricted namespace
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"kubectl",
"create",
@@ -51,7 +51,7 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
nsRestr,
),
)
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"kubectl",
"label",
@@ -68,14 +68,14 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
)
// Create an Integration into a restricted namespace
name := RandomizedSuffixName("java-fail")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
// Check the error is reported into the Integration
- Eventually(IntegrationPhase(t, nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Status).
+ g.Eventually(IntegrationPhase(t, nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Status).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Message).
+ g.Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Message).
Should(ContainSubstring("is forbidden: violates PodSecurity"))
// Clean up
- Eventually(DeleteIntegrations(t, nsRestr)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, nsRestr)).Should(Equal(0))
})
}
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 3f6bad518..7791863d0 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -37,30 +37,30 @@ import (
func TestKamelCLIDump(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("dump empty namespace", func(t *testing.T) {
dump := GetOutputString(Kamel(t, "dump", "-n", ns))
- Expect(dump).To(ContainSubstring("Found 0 integrations:"))
- Expect(dump).To(ContainSubstring("Found 0 deployments:"))
+ g.Expect(dump).To(ContainSubstring("Found 0 integrations:"))
+ g.Expect(dump).To(ContainSubstring("Found 0 deployments:"))
})
t.Run("dump non-empty namespace", func(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "yaml")).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "yaml")).Should(ContainSubstring("Magicstring!"))
dump := GetOutputString(Kamel(t, "dump", "-n", ns))
- Expect(dump).To(ContainSubstring("Found 1 platforms"))
- Expect(dump).To(ContainSubstring("Found 1 integrations"))
- Expect(dump).To(ContainSubstring("name: yaml"))
- Expect(dump).To(ContainSubstring("Magicstring!"))
+ g.Expect(dump).To(ContainSubstring("Found 1 platforms"))
+ g.Expect(dump).To(ContainSubstring("Found 1 integrations"))
+ g.Expect(dump).To(ContainSubstring("name: yaml"))
+ g.Expect(dump).To(ContainSubstring("Magicstring!"))
})
})
}
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index a9793a904..c17839ef9 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -41,7 +41,7 @@ import (
func TestEnvironmentTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// HTTP proxy configuration
httpProxy := "http://proxy"
noProxy := []string{
@@ -53,37 +53,37 @@ func TestEnvironmentTrait(t *testing.T) {
// Retrieve the Kubernetes Service ClusterIPs to populate the NO_PROXY environment variable
svc := Service(t, TestDefaultNamespace, "kubernetes")()
- Expect(svc).NotTo(BeNil())
+ g.Expect(svc).NotTo(BeNil())
noProxy = append(noProxy, svc.Spec.ClusterIPs...)
// Retrieve the internal container registry to populate the NO_PROXY environment variable
if registry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY"); ok {
domain := RegistryRegexp.FindString(registry)
- Expect(domain).NotTo(BeNil())
+ g.Expect(domain).NotTo(BeNil())
domain = strings.Split(domain, ":")[0]
noProxy = append(noProxy, domain)
}
// Install Camel K with the HTTP proxy environment variable
operatorID := "camel-k-trait-environment"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run integration with default environment", func(t *testing.T) {
name := RandomizedSuffixName("java-default")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -104,15 +104,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration with custom environment", func(t *testing.T) {
name := RandomizedSuffixName("java-custom-proxy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.vars=HTTP_PROXY=http://custom.proxy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -133,15 +133,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration without default HTTP proxy environment", func(t *testing.T) {
name := RandomizedSuffixName("java-no-proxy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.http-proxy=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -160,15 +160,15 @@ func TestEnvironmentTrait(t *testing.T) {
)))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
envTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "environment")
- Expect(envTrait).ToNot(BeNil())
- Expect(len(envTrait)).To(Equal(1))
- Expect(envTrait["httpProxy"]).To(Equal(false))
+ g.Expect(envTrait).ToNot(BeNil())
+ g.Expect(len(envTrait)).To(Equal(1))
+ g.Expect(envTrait["httpProxy"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index 5f627e73d..09172c6ca 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -38,224 +38,224 @@ import (
func TestRunIncrementalBuildRoutine(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-incremental-build-routine"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := "java-clone"
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
+ g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
})
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be saving just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildPod(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-incremental-build-pod"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
+ g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
})
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildOff(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-standard-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
t.Run("Don't reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(Kit(t, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Don't create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-different-base"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Create new hierarchy kit", func(t *testing.T) {
// We should spin off a new hierarchy of builds
newBaseImage := "eclipse-temurin:17.0.8.1_1-jdk-ubi9-minimal"
name = RandomizedSuffixName("java-new")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-d", "camel:mongodb",
"-t", fmt.Sprintf("builder.base-image=%s", newBaseImage),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName = IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go
index e26000097..849450f1d 100644
--- a/e2e/advanced/integration_profile_test.go
+++ b/e2e/advanced/integration_profile_test.go
@@ -38,10 +38,10 @@ import (
func TestIntegrationProfile(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-integration-profile"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -50,44 +50,44 @@ func TestIntegrationProfile(t *testing.T) {
LimitCPU: "0.2",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- WithNewTestNamespace(t, func(ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
integrationProfile := v1.NewIntegrationProfile(ns1, "ipr-local")
integrationProfile.SetOperatorID(operatorID)
integrationProfile.Spec.Traits.Container = &traitv1.ContainerTrait{
LimitCPU: "0.1",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
t.Run("Run integration with global integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
containerName := pod.Spec.Containers[0].Name
return containerName == "ck-integration-global"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration with namespace local integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -95,20 +95,20 @@ func TestIntegrationProfile(t *testing.T) {
return containerName == "integration"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration without integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "normal", func(pod *corev1.Pod) bool {
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "normal", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -118,7 +118,7 @@ func TestIntegrationProfile(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
@@ -126,10 +126,10 @@ func TestIntegrationProfile(t *testing.T) {
func TestIntegrationProfileInfluencesKit(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-kit"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -137,44 +137,44 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) {
Properties: []string{"b1=foo"},
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(t, ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodPhase(t, ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the default base image
integrationKitName := IntegrationKit(t, ns, "normal")()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(t, ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodPhase(t, ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the previous kit
integrationKitNameWithProfile := IntegrationKit(t, ns, "simple")()
- Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName))
- Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestPropagateIntegrationProfileChanges(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-changes"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "debug-profile")
integrationProfile.SetOperatorID(operatorID)
@@ -185,13 +185,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
Level: "DEBUG",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -199,13 +199,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
return containerName == "ck-ipr"
}), TestTimeoutShort).Should(BeTrue())
- Expect(UpdateIntegrationProfile(t, ns, func(ipr *v1.IntegrationProfile) {
+ g.Expect(UpdateIntegrationProfile(t, ns, func(ipr *v1.IntegrationProfile) {
ipr.Spec.Traits.Container = &traitv1.ContainerTrait{
Name: "ck-ipr-new",
}
})).To(Succeed())
- Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -214,6 +214,6 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 532397c43..4a77e16ed 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -36,30 +36,30 @@ import (
func TestKameletFromCustomRepository(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
kameletName := "timer-custom-source"
removeKamelet(t, kameletName, ns)
- Eventually(Kamelet(t, kameletName, ns)).Should(BeNil())
+ g.Eventually(Kamelet(t, kameletName, ns)).Should(BeNil())
// Add the custom repository
- Expect(Kamel(t, "kamelet", "add-repo",
+ g.Expect(Kamel(t, "kamelet", "add-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
+ g.Eventually(IntegrationLogs(t, ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
// Remove the custom repository
- Expect(Kamel(t, "kamelet", "remove-repo",
+ g.Expect(Kamel(t, "kamelet", "remove-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index ddfc20a2a..d6403862d 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -36,29 +36,29 @@ import (
func TestLocalPlatform(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-platform-local"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
+ g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
pl.Spec.Build.Maven.Properties["build-global-prop1"] = "build-global-value1"
// set maximum number of running builds
pl.Spec.Build.MaxRunningBuilds = 1
})).To(Succeed())
- Eventually(PlatformHas(t, ns, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformHas(t, ns, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutMedium).Should(BeTrue())
- WithNewTestNamespace(t, func(ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
- Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
+ g.Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
pl.Spec.Build.Maven.Properties["build-local-prop1"] = "build-local-value1"
pl.SetOperatorID(operatorID)
@@ -68,30 +68,30 @@ func TestLocalPlatform(t *testing.T) {
}
})).To(Succeed())
- Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Cluster != ""
}), TestTimeoutShort).Should(BeTrue())
- Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutShort).Should(BeTrue())
pl := PlatformByName(t, ns, operatorID)()
local := Platform(t, ns1)()
- Expect(local.Status.Build.PublishStrategy).To(Equal(pl.Status.Build.PublishStrategy))
- Expect(local.Status.Build.BuildConfiguration.Strategy).To(Equal(pl.Status.Build.BuildConfiguration.Strategy))
- Expect(local.Status.Build.BuildConfiguration.OrderStrategy).To(Equal(pl.Status.Build.BuildConfiguration.OrderStrategy))
- Expect(local.Status.Build.Maven.LocalRepository).To(Equal(pl.Status.Build.Maven.LocalRepository))
- Expect(local.Status.Build.Maven.CLIOptions).To(ContainElements(pl.Status.Build.Maven.CLIOptions))
- Expect(local.Status.Build.Maven.Extension).To(BeEmpty())
- Expect(local.Status.Build.Maven.Properties).To(HaveLen(2))
- Expect(local.Status.Build.Maven.Properties["build-global-prop1"]).To(Equal("build-global-value1"))
- Expect(local.Status.Build.Maven.Properties["build-local-prop1"]).To(Equal("build-local-value1"))
-
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "local-integration", func(pod *corev1.Pod) bool {
+ g.Expect(local.Status.Build.PublishStrategy).To(Equal(pl.Status.Build.PublishStrategy))
+ g.Expect(local.Status.Build.BuildConfiguration.Strategy).To(Equal(pl.Status.Build.BuildConfiguration.Strategy))
+ g.Expect(local.Status.Build.BuildConfiguration.OrderStrategy).To(Equal(pl.Status.Build.BuildConfiguration.OrderStrategy))
+ g.Expect(local.Status.Build.Maven.LocalRepository).To(Equal(pl.Status.Build.Maven.LocalRepository))
+ g.Expect(local.Status.Build.Maven.CLIOptions).To(ContainElements(pl.Status.Build.Maven.CLIOptions))
+ g.Expect(local.Status.Build.Maven.Extension).To(BeEmpty())
+ g.Expect(local.Status.Build.Maven.Properties).To(HaveLen(2))
+ g.Expect(local.Status.Build.Maven.Properties["build-global-prop1"]).To(Equal("build-global-value1"))
+ g.Expect(local.Status.Build.Maven.Properties["build-local-prop1"]).To(Equal("build-local-value1"))
+
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "local-integration", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -100,7 +100,7 @@ func TestLocalPlatform(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index f3acd57e7..a556377b6 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -60,7 +60,7 @@ var httpdTlsMountPath = "/etc/tls/private"
func TestMavenProxy(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
hostname := fmt.Sprintf("%s.%s.svc", "proxy", ns)
// Generate the TLS certificate
@@ -80,7 +80,7 @@ func TestMavenProxy(t *testing.T) {
// generate the certificate private key
certPrivateKey, err := rsa.GenerateKey(rand.Reader, 2048)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
privateKeyBytes := x509.MarshalPKCS1PrivateKey(certPrivateKey)
// encode for storing into a Secret
@@ -91,7 +91,7 @@ func TestMavenProxy(t *testing.T) {
},
)
certBytes, err := x509.CreateCertificate(rand.Reader, cert, cert, &certPrivateKey.PublicKey, certPrivateKey)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// encode for storing into a Secret
certPem := pem.EncodeToMemory(&pem.Block{
@@ -114,21 +114,21 @@ func TestMavenProxy(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD ConfigMap
config := newHTTPDConfigMap(ns, hostname)
- Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// HTTPD Deployment
deployment := newHTTPDDeployment(ns, config.Name, secret.Name)
- Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := newHTTPDService(deployment)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -138,7 +138,7 @@ func TestMavenProxy(t *testing.T) {
))
svc := Service(t, TestDefaultNamespace, "kubernetes")()
- Expect(svc).NotTo(BeNil())
+ g.Expect(svc).NotTo(BeNil())
// It may be needed to populate the values from the cluster, machine and service network CIDRs
noProxy := []string{
@@ -150,8 +150,8 @@ func TestMavenProxy(t *testing.T) {
// Install Camel K with the HTTP proxy
operatorID := "camel-k-maven-proxy"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
olm, olmErr := olm.IsAPIAvailable(TestClient(t))
installed, inErr := kubernetes.IsAPIResourceInstalled(TestClient(t), configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
permission, pErr := kubernetes.CheckPermission(TestContext, TestClient(t), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "", "cluster", "edit")
@@ -163,12 +163,12 @@ func TestMavenProxy(t *testing.T) {
key := ctrl.ObjectKey{
Name: "cluster",
}
- Expect(TestClient(t).Get(TestContext, key, &defaultProxy)).To(Succeed())
+ g.Expect(TestClient(t).Get(TestContext, key, &defaultProxy)).To(Succeed())
newProxy := defaultProxy.DeepCopy()
newProxy.Spec.HTTPProxy = fmt.Sprintf("http://%s", hostname)
newProxy.Spec.NoProxy = strings.Join(noProxy, ",")
- Expect(TestClient(t).Update(TestContext, newProxy))
+ g.Expect(TestClient(t).Update(TestContext, newProxy))
defer func() {
//
@@ -181,9 +181,9 @@ func TestMavenProxy(t *testing.T) {
}()
// ENV values should be injected by the OLM
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s", hostname),
// TODO: enable TLS for the HTTPS proxy when Maven supports it
// "--operator-env-vars", fmt.Sprintf("HTTPS_PROXY=https://%s", hostname),
@@ -192,15 +192,15 @@ func TestMavenProxy(t *testing.T) {
).Execute()).To(Succeed())
}
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
proxies := corev1.PodList{
TypeMeta: metav1.TypeMeta{
@@ -212,19 +212,19 @@ func TestMavenProxy(t *testing.T) {
ctrl.InNamespace(ns),
ctrl.MatchingLabels(deployment.Spec.Selector.MatchLabels),
)
- Expect(err).To(Succeed())
- Expect(proxies.Items).To(HaveLen(1))
+ g.Expect(err).To(Succeed())
+ g.Expect(proxies.Items).To(HaveLen(1))
logs := Logs(t, ns, proxies.Items[0].Name, corev1.PodLogOptions{})()
- Expect(logs).NotTo(BeEmpty())
- Expect(logs).To(ContainSubstring("\"CONNECT repo.maven.apache.org:443 HTTP/1.1\" 200"))
+ g.Expect(logs).NotTo(BeEmpty())
+ g.Expect(logs).To(ContainSubstring("\"CONNECT repo.maven.apache.org:443 HTTP/1.1\" 200"))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index 95c9aff77..d7c316e4e 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -37,91 +37,91 @@ import (
func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
}
func TestOperatorIDFiltering(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- WithNewTestNamespace(t, func(nsop1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ WithNewTestNamespace(t, func(g *WithT, nsop1 string) {
operator1 := "operator-1"
- Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- WithNewTestNamespace(t, func(nsop2 string) {
+ WithNewTestNamespace(t, func(g *WithT, nsop2 string) {
operator2 := "operator-2"
- Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
- Consistently(IntegrationPhase(t, ns, "untouched"), 10*time.Second).Should(BeEmpty())
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
+ g.Consistently(IntegrationPhase(t, ns, "untouched"), 10*time.Second).Should(BeEmpty())
})
t.Run("Operators run scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
- Expect(AssignIntegrationToOperator(t, ns, "moving", operator1)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
+ g.Expect(AssignIntegrationToOperator(t, ns, "moving", operator1)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can handoff scoped integrations", func(t *testing.T) {
- Expect(AssignIntegrationToOperator(t, ns, "moving", operator2)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(AssignIntegrationToOperator(t, ns, "moving", operator2)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can be deactivated after completely handing off scoped integrations", func(t *testing.T) {
- Expect(ScaleOperator(t, nsop1, 0)).To(Succeed())
- Expect(Kamel(t, "rebuild", "-n", ns, "moving").Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleOperator(t, nsop1, 1)).To(Succeed())
+ g.Expect(ScaleOperator(t, nsop1, 0)).To(Succeed())
+ g.Expect(Kamel(t, "rebuild", "-n", ns, "moving").Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(ScaleOperator(t, nsop1, 1)).To(Succeed())
})
t.Run("Operators can run scoped integrations with fixed image", func(t *testing.T) {
image := IntegrationPodImage(t, ns, "moving")()
- Expect(image).NotTo(BeEmpty())
+ g.Expect(image).NotTo(BeEmpty())
// Save resources by deleting "moving" integration
- Expect(Kamel(t, "delete", "moving", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "moving", "-n", ns).Execute()).To(Succeed())
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
"-t", fmt.Sprintf("container.image=%s", image), "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Consistently(IntegrationPhase(t, ns, "pre-built"), 10*time.Second).Should(BeEmpty())
- Expect(AssignIntegrationToOperator(t, ns, "pre-built", operator2)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ g.Consistently(IntegrationPhase(t, ns, "pre-built"), 10*time.Second).Should(BeEmpty())
+ g.Expect(AssignIntegrationToOperator(t, ns, "pre-built", operator2)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
t.Run("Operators can run scoped Pipes", func(t *testing.T) {
- Expect(KamelBindWithID(t, "operator-x", ns, "timer-source?message=Hello", "log-sink",
+ g.Expect(KamelBindWithID(t, "operator-x", ns, "timer-source?message=Hello", "log-sink",
"--name", "klb", "--force").Execute()).To(Succeed())
- Consistently(Integration(t, ns, "klb"), 10*time.Second).Should(BeNil())
+ g.Consistently(Integration(t, ns, "klb"), 10*time.Second).Should(BeNil())
- Expect(AssignPipeToOperator(t, ns, "klb", operator1)).To(Succeed())
- Eventually(Integration(t, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(IntegrationPhase(t, ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(AssignPipeToOperator(t, ns, "klb", operator1)).To(Succeed())
+ g.Eventually(Integration(t, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(IntegrationPhase(t, ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
})
})
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go
index af5454448..de59ed585 100644
--- a/e2e/advanced/operator_metrics_test.go
+++ b/e2e/advanced/operator_metrics_test.go
@@ -58,25 +58,25 @@ func TestMetrics(t *testing.T) {
t.Skip("WARNING: Test marked as problematic ... skipping")
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
operatorID := "camel-k-metrics"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "prometheus.enabled=true",
"-t", "prometheus.pod-monitor=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := OperatorPod(t, ns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
@@ -84,24 +84,24 @@ func TestMetrics(t *testing.T) {
Container: "camel-k-operator",
}
logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
- Expect(err).To(BeNil())
- Expect(logs).NotTo(BeEmpty())
+ g.Expect(err).To(BeNil())
+ g.Expect(logs).NotTo(BeEmpty())
response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/metrics", pod.Namespace, pod.Name)).DoRaw(TestContext)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
metrics, err := parsePrometheusData(response)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
it := Integration(t, ns, name)()
- Expect(it).NotTo(BeNil())
+ g.Expect(it).NotTo(BeNil())
build := Build(t, ns, it.Status.IntegrationKit.Name)()
- Expect(build).NotTo(BeNil())
+ g.Expect(build).NotTo(BeNil())
t.Run("Build duration metric", func(t *testing.T) {
// Get the duration from the Build status
duration, err := time.ParseDuration(build.Status.Duration)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it's consistent with the duration observed from logs
var ts1, ts2 time.Time
@@ -125,18 +125,18 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(build.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
- Expect(ts2).To(BeTemporally(">", ts1))
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).To(BeTemporally(">", ts1))
durationFromLogs := ts2.Sub(ts1)
// With a build strategy there could be a little variance (less than 10 seconds should be enough)
- Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<", 10))
+ g.Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<", 10))
// Check the duration is observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_build_duration_seconds"))
- Expect(metrics["camel_k_build_duration_seconds"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_build_duration_seconds"))
+ g.Expect(metrics["camel_k_build_duration_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_duration_seconds"),
Help: stringP("Camel K build duration"),
@@ -160,7 +160,7 @@ func TestMetrics(t *testing.T) {
t.Run("Build recovery attempts metric", func(t *testing.T) {
// Check there are no failures reported in the Build status
- Expect(build.Status.Failure).To(BeNil())
+ g.Expect(build.Status.Failure).To(BeNil())
// Check no recovery attempts are reported in the logs
recoveryAttempts, err := NewLogCounter(&logs).Count(MatchFields(IgnoreExtras, Fields{
@@ -169,12 +169,12 @@ func TestMetrics(t *testing.T) {
"Kind": Equal("Build"),
"RequestName": Equal(build.Name),
}))
- Expect(err).To(BeNil())
- Expect(recoveryAttempts).To(BeNumerically("==", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(recoveryAttempts).To(BeNumerically("==", 0))
// Check no recovery attempts are observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_build_recovery_attempts"))
- Expect(metrics["camel_k_build_recovery_attempts"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_build_recovery_attempts"))
+ g.Expect(metrics["camel_k_build_recovery_attempts"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_recovery_attempts"),
Help: stringP("Camel K build recovery attempts"),
@@ -197,8 +197,8 @@ func TestMetrics(t *testing.T) {
})
t.Run("reconciliation duration metric", func(t *testing.T) {
- Expect(metrics).To(HaveKey("camel_k_reconciliation_duration_seconds"))
- Expect(metrics["camel_k_reconciliation_duration_seconds"]).To(PointTo(MatchFields(IgnoreExtras,
+ g.Expect(metrics).To(HaveKey("camel_k_reconciliation_duration_seconds"))
+ g.Expect(metrics["camel_k_reconciliation_duration_seconds"]).To(PointTo(MatchFields(IgnoreExtras,
Fields{
"Name": EqualP("camel_k_reconciliation_duration_seconds"),
"Help": EqualP("Camel K reconciliation loop duration"),
@@ -215,7 +215,7 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(ns),
"RequestName": Equal(operatorID),
}))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it matches the observation in the corresponding metric
platformReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -229,9 +229,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(platformReconciled).NotTo(BeNil())
+ g.Expect(platformReconciled).NotTo(BeNil())
platformReconciledCount := *platformReconciled.Histogram.SampleCount
- Expect(platformReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(platformReconciledCount).To(BeNumerically(">", 0))
platformRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -265,7 +265,7 @@ func TestMetrics(t *testing.T) {
platformErroredCount = *platformErrored.Histogram.SampleCount
}
- Expect(platformReconciliations).To(BeNumerically("==", platformReconciledCount+platformRequeuedCount+platformErroredCount))
+ g.Expect(platformReconciliations).To(BeNumerically("==", platformReconciledCount+platformRequeuedCount+platformErroredCount))
// Count the number of Integration reconciliations
integrationReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -274,8 +274,8 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(it.Namespace),
"RequestName": Equal(it.Name),
}))
- Expect(err).To(BeNil())
- Expect(integrationReconciliations).To(BeNumerically(">", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationReconciliations).To(BeNumerically(">", 0))
// Check it matches the observation in the corresponding metric
integrationReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -289,9 +289,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(integrationReconciled).NotTo(BeNil())
+ g.Expect(integrationReconciled).NotTo(BeNil())
integrationReconciledCount := *integrationReconciled.Histogram.SampleCount
- Expect(integrationReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(integrationReconciledCount).To(BeNumerically(">", 0))
integrationRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -325,7 +325,7 @@ func TestMetrics(t *testing.T) {
integrationErroredCount = *integrationErrored.Histogram.SampleCount
}
- Expect(integrationReconciliations).To(BeNumerically("==", integrationReconciledCount+integrationRequeuedCount+integrationErroredCount))
+ g.Expect(integrationReconciliations).To(BeNumerically("==", integrationReconciledCount+integrationRequeuedCount+integrationErroredCount))
// Count the number of IntegrationKit reconciliations
integrationKitReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -334,8 +334,8 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(it.Status.IntegrationKit.Namespace),
"RequestName": Equal(it.Status.IntegrationKit.Name),
}))
- Expect(err).To(BeNil())
- Expect(integrationKitReconciliations).To(BeNumerically(">", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationKitReconciliations).To(BeNumerically(">", 0))
// Check it matches the observation in the corresponding metric
integrationKitReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -349,9 +349,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(integrationKitReconciled).NotTo(BeNil())
+ g.Expect(integrationKitReconciled).NotTo(BeNil())
integrationKitReconciledCount := *integrationKitReconciled.Histogram.SampleCount
- Expect(integrationKitReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(integrationKitReconciledCount).To(BeNumerically(">", 0))
// Kit can be requeued, above all when a catalog needs to be built
integrationKitRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -371,7 +371,7 @@ func TestMetrics(t *testing.T) {
integrationKitRequeuedCount = *integrationKitRequeued.Histogram.SampleCount
}
- Expect(integrationKitReconciliations).To(BeNumerically("==", integrationKitReconciledCount+integrationKitRequeuedCount))
+ g.Expect(integrationKitReconciliations).To(BeNumerically("==", integrationKitReconciledCount+integrationKitRequeuedCount))
// Count the number of Build reconciliations
buildReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -380,7 +380,7 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(build.Namespace),
"RequestName": Equal(build.Name),
}))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it matches the observation in the corresponding metric
buildReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -394,9 +394,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(buildReconciled).NotTo(BeNil())
+ g.Expect(buildReconciled).NotTo(BeNil())
buildReconciledCount := *buildReconciled.Histogram.SampleCount
- Expect(buildReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(buildReconciledCount).To(BeNumerically(">", 0))
buildRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -414,7 +414,7 @@ func TestMetrics(t *testing.T) {
buildRequeuedCount = *buildRequeued.Histogram.SampleCount
}
- Expect(buildReconciliations).To(BeNumerically("==", buildReconciledCount+buildRequeuedCount))
+ g.Expect(buildReconciliations).To(BeNumerically("==", buildReconciledCount+buildRequeuedCount))
})
t.Run("Build queue duration metric", func(t *testing.T) {
@@ -432,27 +432,27 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(build.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
durationFromLogs := ts2.Sub(ts1)
// Retrieve the queuing duration from the metric
- Expect(metrics).To(HaveKey("camel_k_build_queue_duration_seconds"))
+ g.Expect(metrics).To(HaveKey("camel_k_build_queue_duration_seconds"))
metric := metrics["camel_k_build_queue_duration_seconds"].Metric
- Expect(metric).To(HaveLen(1))
+ g.Expect(metric).To(HaveLen(1))
histogram := metric[0].Histogram
- Expect(histogram).NotTo(BeNil())
- Expect(histogram.SampleSum).NotTo(BeNil())
+ g.Expect(histogram).NotTo(BeNil())
+ g.Expect(histogram.SampleSum).NotTo(BeNil())
duration := *histogram.SampleSum
// Check both durations match
- Expect(math.Abs(durationFromLogs.Seconds() - duration)).To(BeNumerically("<", 1))
+ g.Expect(math.Abs(durationFromLogs.Seconds() - duration)).To(BeNumerically("<", 1))
// Check the queuing duration is correctly observed in the corresponding metric
- Expect(metrics["camel_k_build_queue_duration_seconds"]).To(EqualP(
+ g.Expect(metrics["camel_k_build_queue_duration_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_queue_duration_seconds"),
Help: stringP("Camel K build queue duration"),
@@ -478,10 +478,10 @@ func TestMetrics(t *testing.T) {
// The start time is taken from the Integration status initialization timestamp
ts1 = it.Status.InitializationTimestamp.Time
- Expect(ts1).NotTo(BeZero())
+ g.Expect(ts1).NotTo(BeZero())
// The end time is reported into the ready condition first truthy time
ts2 = it.Status.GetCondition(v1.IntegrationConditionReady).FirstTruthyTime.Time
- Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
duration := ts2.Sub(ts1)
@@ -500,29 +500,29 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(it.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
- Expect(ts2).To(BeTemporally(">", ts1))
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).To(BeTemporally(">", ts1))
durationFromLogs := ts2.Sub(ts1)
// Check both durations match
- Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<=", 1))
+ g.Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<=", 1))
// Retrieve the first readiness duration from the metric
- Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
+ g.Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
metric := metrics["camel_k_integration_first_readiness_seconds"].Metric
- Expect(metric).To(HaveLen(1))
+ g.Expect(metric).To(HaveLen(1))
histogram := metric[0].Histogram
- Expect(histogram).NotTo(BeNil())
+ g.Expect(histogram).NotTo(BeNil())
// Check both durations match
d := duration.Seconds()
- Expect(math.Abs(*histogram.SampleSum - d)).To(BeNumerically("<=", 1))
+ g.Expect(math.Abs(*histogram.SampleSum - d)).To(BeNumerically("<=", 1))
// Check the duration is correctly observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
- Expect(metrics["camel_k_integration_first_readiness_seconds"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
+ g.Expect(metrics["camel_k_integration_first_readiness_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_integration_first_readiness_seconds"),
Help: stringP("Camel K integration time to first readiness"),
@@ -541,7 +541,7 @@ func TestMetrics(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index 1f12d07a7..d62b32b46 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -38,46 +38,46 @@ import (
func TestTraitOnIntegrationPlatform(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-platform-trait-test"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
containerTestName := "testname"
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ip := Platform(t, ns)()
ip.Spec.Traits = v1.Traits{Logging: &trait.LoggingTrait{Level: "DEBUG"}, Container: &trait.ContainerTrait{Name: containerTestName}}
if err := TestClient(t).Update(TestContext, ip); err != nil {
t.Fatal("Can't create IntegrationPlatform", err)
}
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
t.Run("Run integration with platform traits", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
+ g.Expect(IntegrationPod(t, ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
found := false
for _, env := range IntegrationPod(t, ns, name)().Spec.Containers[0].Env {
if env.Name == "QUARKUS_LOG_LEVEL" {
- Expect(env.Value).To(BeEquivalentTo("DEBUG"))
+ g.Expect(env.Value).To(BeEquivalentTo("DEBUG"))
found = true
break
}
}
- Expect(found).To(BeTrue(), "Can't find QUARKUS_LOG_LEVEL ENV variable")
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
+ g.Expect(found).To(BeTrue(), "Can't find QUARKUS_LOG_LEVEL ENV variable")
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index e5ea4ee52..0051dd0cb 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -39,12 +39,12 @@ func TestKamelCLIPromote(t *testing.T) {
one := int64(1)
two := int64(2)
// Dev environment namespace
- WithNewTestNamespace(t, func(nsDev string) {
+ WithNewTestNamespace(t, func(g *WithT, nsDev string) {
operatorDevID := "camel-k-cli-promote-dev"
- Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Dev content configmap
var cmData = make(map[string]string)
@@ -56,41 +56,41 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextSecret(t, nsDev, "my-sec-promote", secData)
t.Run("plain integration dev", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route.groovy",
"--config", "configmap:my-cm-promote",
"--config", "secret:my-sec-promote",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&one))
- //Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
+ g.Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&one))
+ //g.Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
})
t.Run("kamelet integration dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
t.Run("binding dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ g.Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
+ g.Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
})
// Prod environment namespace
- WithNewTestNamespace(t, func(nsProd string) {
+ WithNewTestNamespace(t, func(g *WithT, nsProd string) {
operatorProdID := "camel-k-cli-promote-prod"
- Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("no configmap in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod content configmap
@@ -99,7 +99,7 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
t.Run("no secret in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod secret
@@ -108,72 +108,72 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextSecret(t, nsProd, "my-sec-promote", secData)
t.Run("plain integration promotion", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationObservedGeneration(t, nsProd, "promote-route")).Should(Equal(&one))
- Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationObservedGeneration(t, nsProd, "promote-route")).Should(Equal(&one))
+ g.Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("plain integration promotion update", func(t *testing.T) {
// We need to update the Integration CR in order the operator to restart it both in dev and prod envs
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
"--config", "configmap:my-cm-promote").Execute()).To(Succeed())
// The generation has to be incremented
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ g.Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
// Update the configmap only in prod
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "I am production, but I was updated!"
UpdatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
// Promote the edited Integration
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
// The generation has to be incremented also in prod
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ g.Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("no kamelet in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("kamelet integration promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
- Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(t, nsDev, "timer-kamelet-usage")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(t, nsDev, "timer-kamelet-usage")()))
})
t.Run("no kamelet for binding in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("binding promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ g.Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(t, nsDev, "kb-timer-source-to-log")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(t, nsDev, "kb-timer-source-to-log")()))
//Binding update
- Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ g.Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
})
})
})
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 3c866768c..7e7a34504 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -35,60 +35,60 @@ import (
func TestKamelReset(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-cli-reset"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Reset the whole platform", func(t *testing.T) {
name := RandomizedSuffixName("yaml1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(BeNil())
- Expect(Kits(t, ns)()).To(HaveLen(0))
+ g.Expect(Integration(t, ns, name)()).To(BeNil())
+ g.Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-integrations", func(t *testing.T) {
name := RandomizedSuffixName("yaml2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(Not(BeNil()))
- Expect(Kits(t, ns)()).To(HaveLen(0))
+ g.Expect(Integration(t, ns, name)()).To(Not(BeNil()))
+ g.Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-kits", func(t *testing.T) {
name := RandomizedSuffixName("yaml3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
kitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, kitName)).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, kitName)).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(BeNil())
- Expect(Kit(t, ns, kitName)()).To(Not(BeNil()))
+ g.Expect(Integration(t, ns, name)()).To(BeNil())
+ g.Expect(Kit(t, ns, kitName)()).To(Not(BeNil()))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index a1f25eeb4..972036019 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -37,89 +37,90 @@ import (
func TestSyntheticIntegrationOff(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Install Camel K without synthetic Integration feature variable (default)
operatorID := "camel-k-synthetic-env-off"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the external deployment
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ g.Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Label the deployment --> Verify the Integration is not created
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
func TestSyntheticIntegrationFromDeployment(t *testing.T) {
- RegisterTestingT(t)
- WithNewTestNamespace(t, func(ns string) {
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Install Camel K with the synthetic Integration feature variable
operatorID := "camel-k-synthetic-env"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
).Execute()).To(Succeed())
// Run the external deployment
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ g.Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Label the deployment --> Verify the Integration is created (cannot still monitor)
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionMonitoringPodsAvailableReason)))
// Label the deployment template --> Verify the Integration is monitored
- ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
one := int32(1)
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Delete the deployment --> Verify the Integration is eventually garbage collected
- ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Recreate the deployment and label --> Verify the Integration is monitored
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Remove label from the deployment --> Verify the Integration is deleted
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration-", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration-", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Add label back to the deployment --> Verify the Integration is created
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Scale the deployment --> verify replicas are correctly set
- ExpectExecSucceed(t, Kubectl("scale", "deploy", "my-camel-sb-svc", "--replicas", "2", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("scale", "deploy", "my-camel-sb-svc", "--replicas", "2", "-n", ns))
two := int32(2)
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
// Delete Integration and deployments --> verify no Integration exists any longer
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ ExpectExecSucceed(t, g, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
diff --git a/e2e/advanced/tekton_test.go b/e2e/advanced/tekton_test.go
index 4f075a11c..448f4c7e0 100644
--- a/e2e/advanced/tekton_test.go
+++ b/e2e/advanced/tekton_test.go
@@ -35,14 +35,14 @@ import (
func TestTektonLikeBehavior(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- Expect(CreateOperatorServiceAccount(t, ns)).To(Succeed())
- Expect(CreateOperatorRole(t, ns)).To(Succeed())
- Expect(CreateOperatorRoleBinding(t, ns)).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ g.Expect(CreateOperatorServiceAccount(t, ns)).To(Succeed())
+ g.Expect(CreateOperatorRole(t, ns)).To(Succeed())
+ g.Expect(CreateOperatorRoleBinding(t, ns)).To(Succeed())
- Eventually(OperatorPod(t, ns)).Should(BeNil())
- Expect(CreateKamelPod(t, ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).Should(BeNil())
+ g.Expect(CreateKamelPod(t, ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 709054b17..33498a5d1 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -42,8 +42,8 @@ type kitOptions struct {
}
func TestKitMaxBuildLimit(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -58,8 +58,8 @@ func TestKitMaxBuildLimit(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- WithNewTestNamespace(t, func(ns1 string) {
- WithNewTestNamespace(t, func(ns2 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
pl1 := v1.NewIntegrationPlatform(ns1, fmt.Sprintf("camel-k-%s", ns))
pl.Spec.DeepCopyInto(&pl1.Spec)
pl1.Spec.Build.Maven.Settings = v1.ValueSource{}
@@ -69,7 +69,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
t.FailNow()
}
- Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
pl2 := v1.NewIntegrationPlatform(ns2, fmt.Sprintf("camel-k-%s", ns))
pl.Spec.DeepCopyInto(&pl2.Spec)
@@ -80,9 +80,9 @@ func TestKitMaxBuildLimit(t *testing.T) {
t.FailNow()
}
- Eventually(PlatformPhase(t, ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -92,7 +92,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns1, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns1, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -102,7 +102,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns2, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns2, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -119,7 +119,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns1, buildB), BuildPhase(t, ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns1, buildB), BuildPhase(t, ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -130,22 +130,22 @@ func TestKitMaxBuildLimit(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
})
})
}
func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -160,7 +160,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -170,7 +170,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -180,7 +180,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -197,7 +197,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -208,18 +208,18 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -234,7 +234,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -244,7 +244,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -254,7 +254,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -271,7 +271,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -282,18 +282,18 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -308,7 +308,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -318,7 +318,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -328,7 +328,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -339,23 +339,23 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
// verify that last build is waiting
- Eventually(BuildConditions(t, ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(BuildConditions(t, ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionWaitingReason))
// verify that last build is scheduled
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildConditions(t, ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(BuildConditions(t, ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionReadyReason))
})
@@ -392,22 +392,22 @@ func doKitFullBuild(t *testing.T, name string, buildTimeout string, testTimeout
options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
t.Helper()
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, buildTimeout)
- doKitBuildInNamespace(t, name, ns, testTimeout, options, buildPhase, kitPhase)
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, buildTimeout)
+ doKitBuildInNamespace(t, g, name, ns, testTimeout, options, buildPhase, kitPhase)
})
}
-func createOperator(t *testing.T, ns string, buildTimeout string, installArgs ...string) {
+func createOperator(t *testing.T, g *WithT, ns string, buildTimeout string, installArgs ...string) {
args := []string{"--build-timeout", buildTimeout}
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
}
-func doKitBuildInNamespace(t *testing.T, name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
+func doKitBuildInNamespace(t *testing.T, g *WithT, name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
buildKitArgs := []string{"kit", "create", name, "-n", ns}
for _, dependency := range options.dependencies {
@@ -423,13 +423,13 @@ func doKitBuildInNamespace(t *testing.T, name string, ns string, testTimeout tim
buildKitArgs = append(buildKitArgs, "--operator-id", fmt.Sprintf("camel-k-%s", ns))
}
- Expect(Kamel(t, buildKitArgs...).Execute()).To(Succeed())
+ g.Expect(Kamel(t, buildKitArgs...).Execute()).To(Succeed())
- Eventually(Build(t, ns, name), testTimeout).ShouldNot(BeNil())
+ g.Eventually(Build(t, ns, name), testTimeout).ShouldNot(BeNil())
if buildPhase != v1.BuildPhaseNone {
- Eventually(BuildPhase(t, ns, name), testTimeout).Should(Equal(buildPhase))
+ g.Eventually(BuildPhase(t, ns, name), testTimeout).Should(Equal(buildPhase))
}
if kitPhase != v1.IntegrationKitPhaseNone {
- Eventually(KitPhase(t, ns, name), testTimeout).Should(Equal(kitPhase))
+ g.Eventually(KitPhase(t, ns, name), testTimeout).Should(Equal(kitPhase))
}
}
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index 1d4c5b3bf..e61b72dbc 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -41,9 +41,9 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
return
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-docker-hub"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.io",
"--organization", user,
"--registry-auth-username", user,
@@ -51,12 +51,12 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -69,9 +69,9 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
return
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-github-registry"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.pkg.github.com",
"--organization", repo,
"--registry-auth-username", user,
@@ -79,11 +79,11 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index 45dd4c265..ed98095c8 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -33,34 +33,34 @@ import (
)
func TestKamelCLIBind(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
kameletName := "test-timer-source"
- Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
t.Run("bind timer to log", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
- Expect(KamelBindWithID(t, operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
- Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
+ g.Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
})
t.Run("bind with custom SA", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
- Eventually(IntegrationSpecSA(t, ns, "timer-to-log")).Should(Equal("my-service-account"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
+ g.Eventually(IntegrationSpecSA(t, ns, "timer-to-log")).Should(Equal("my-service-account"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go
index 476a1ff85..46c2a560e 100644
--- a/e2e/common/cli/config_test.go
+++ b/e2e/common/cli/config_test.go
@@ -39,30 +39,30 @@ import (
)
func TestKamelCLIConfig(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("check default namespace", func(t *testing.T) {
_, err := os.Stat(cmd.DefaultConfigLocation)
assert.True(t, os.IsNotExist(err), "No file at "+cmd.DefaultConfigLocation+" was expected")
t.Cleanup(func() { os.Remove(cmd.DefaultConfigLocation) })
- Expect(Kamel(t, "config", "--default-namespace", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "config", "--default-namespace", ns).Execute()).To(Succeed())
_, err = os.Stat(cmd.DefaultConfigLocation)
require.NoError(t, err, "A file at "+cmd.DefaultConfigLocation+" was expected")
- Expect(Kamel(t, "run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// first line of the integration logs
logs := strings.Split(IntegrationLogs(t, ns, "yaml")(), "\n")[0]
podName := IntegrationPod(t, ns, "yaml")().Name
logsCLI := GetOutputStringAsync(Kamel(t, "log", "yaml"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(logs))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(logs))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index 6726f145c..cba51eef2 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -33,47 +33,47 @@ import (
)
func TestKamelCLIDelete(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("delete running integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete building integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Expect(Kamel(t, "delete", "java", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "java", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "java")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete all integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Eventually(Integration(t, ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Eventually(Integration(t, ns, "java")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index c4105efdb..4e175c679 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -36,21 +36,21 @@ import (
)
func TestKamelCliDescribe(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Test kamel describe integration", func(t *testing.T) {
integration := GetOutputString(Kamel(t, "describe", "integration", "yaml", "-n", ns))
r, _ := regexp.Compile("(?sm).*Name:\\s+yaml.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ g.Expect(integration).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Phase:\\s+Running.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ g.Expect(integration).To(MatchRegexp(r.String()))
- Expect(integration).To(ContainSubstring("Dependencies:"))
- Expect(integration).To(ContainSubstring("Conditions:"))
+ g.Expect(integration).To(ContainSubstring("Dependencies:"))
+ g.Expect(integration).To(ContainSubstring("Conditions:"))
})
t.Run("Test kamel describe integration kit", func(t *testing.T) {
@@ -59,29 +59,29 @@ func TestKamelCliDescribe(t *testing.T) {
kit := GetOutputString(Kamel(t, "describe", "kit", kitName, "-n", kitNamespace))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + kitNamespace + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ g.Expect(kit).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ g.Expect(kit).To(MatchRegexp(r.String()))
- Expect(kit).To(ContainSubstring("camel-quarkus-core"))
+ g.Expect(kit).To(ContainSubstring("camel-quarkus-core"))
- Expect(kit).To(ContainSubstring("Artifacts:"))
- Expect(kit).To(ContainSubstring("Dependencies:"))
+ g.Expect(kit).To(ContainSubstring("Artifacts:"))
+ g.Expect(kit).To(ContainSubstring("Dependencies:"))
})
t.Run("Test kamel describe integration platform", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", opns))
- Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
+ g.Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + opns + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
+ g.Expect(platform).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
+ g.Expect(platform).To(MatchRegexp(r.String()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index 57041d6f6..6bfd136d7 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -37,7 +37,7 @@ import (
)
func TestRunDevMode(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The changing of the yaml file constant from "string" to "magic" is not being
@@ -50,7 +50,6 @@ func TestRunDevMode(t *testing.T) {
}
t.Run("run yaml dev mode", func(t *testing.T) {
- RegisterTestingT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
piper, pipew := io.Pipe()
@@ -71,16 +70,15 @@ func TestRunDevMode(t *testing.T) {
os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
go kamelRun.Execute()
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
- Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
+ g.Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ g.Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
util.ReplaceInFile(t, file, "string!", "jordan!")
- Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
})
t.Run("run yaml remote dev mode", func(t *testing.T) {
- RegisterTestingT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
piper, pipew := io.Pipe()
@@ -101,7 +99,7 @@ func TestRunDevMode(t *testing.T) {
go kamelRun.Execute()
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
})
// This test makes sure that `kamel run --dev` runs in seconds after initial build is
@@ -113,16 +111,15 @@ func TestRunDevMode(t *testing.T) {
* why it does not finish in a few seconds and remove the bottlenecks which are lagging
* the integration startup.
*/
- RegisterTestingT(t)
name := RandomizedSuffixName("yaml")
// First run (warm up)
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name)).Should(BeNil())
- Eventually(IntegrationPod(t, ns, name), TestTimeoutMedium).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name)).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, name), TestTimeoutMedium).Should(BeNil())
// Second run (rebuild)
ctx, cancel := context.WithCancel(TestContext)
@@ -147,10 +144,10 @@ func TestRunDevMode(t *testing.T) {
// Second run should start up within a few seconds
timeout := 10 * time.Second
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
+ g.Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/duplicate_parameters_test.go b/e2e/common/cli/duplicate_parameters_test.go
index ae0345216..5a1f54618 100644
--- a/e2e/common/cli/duplicate_parameters_test.go
+++ b/e2e/common/cli/duplicate_parameters_test.go
@@ -33,7 +33,7 @@ import (
)
func TestDuplicateParameters(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
@@ -48,11 +48,9 @@ func TestDuplicateParameters(t *testing.T) {
comm, _, _ := cmd.NewKamelWithModelineCommand(ctx, cmdParams)
// the command is executed inside GetOutputString function
- commOutput := GetOutputString(&KamelCLI{
- Command: comm,
- })
+ commOutput := GetOutputString(comm)
outParams :=
`"traits":{"affinity":{"enabled":true},"camel":{"properties":["prop1 = true","prop2 = true","foo = bar"]},"pull-secret":{"enabled":true},"addons":{"telemetry":{"enabled":true}}}`
- Expect(commOutput).To(ContainSubstring(outParams))
+ g.Expect(commOutput).To(ContainSubstring(outParams))
}
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index 4732c56af..2ab5cc504 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -34,46 +34,46 @@ import (
)
func TestKamelCLIGet(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("get integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// regex is used for the compatibility of tests between OC and vanilla K8
// kamel get may have different output depending on the platform
- Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, "yaml")()
kitNamespace := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", kitNamespace, kitName, kitName)
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationKit(t, ns, "java")).ShouldNot(Equal(""))
- Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "java")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
kitName1 := IntegrationKit(t, ns, "java")()
kitName2 := IntegrationKit(t, ns, "yaml")()
kitNamespace1 := IntegrationKitNamespace(t, ns, "java")()
kitNamespace2 := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
"(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", kitNamespace1, kitName1, kitName1, kitNamespace2, kitName2, kitName2)
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get no integrations", func(t *testing.T) {
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Running"))
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Running"))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go
index 2507b6ec4..cdb6eab54 100644
--- a/e2e/common/cli/help_test.go
+++ b/e2e/common/cli/help_test.go
@@ -31,27 +31,27 @@ import (
)
func TestKamelCLIHelp(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("default help message", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "help"))
- Expect(helpMsg).To(ContainSubstring("Apache Camel K is a lightweight integration platform, born on Kubernetes"))
- Expect(helpMsg).To(ContainSubstring("Usage:"))
- Expect(helpMsg).To(ContainSubstring("Available Commands:"))
- Expect(helpMsg).To(ContainSubstring("Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Apache Camel K is a lightweight integration platform, born on Kubernetes"))
+ g.Expect(helpMsg).To(ContainSubstring("Usage:"))
+ g.Expect(helpMsg).To(ContainSubstring("Available Commands:"))
+ g.Expect(helpMsg).To(ContainSubstring("Flags:"))
})
t.Run("'get' command help (short flag)", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "get", "-h"))
- Expect(helpMsg).To(ContainSubstring("Get the status of integrations deployed on Kubernetes"))
- Expect(helpMsg).To(ContainSubstring("Usage:"))
- Expect(helpMsg).To(ContainSubstring("Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Get the status of integrations deployed on Kubernetes"))
+ g.Expect(helpMsg).To(ContainSubstring("Usage:"))
+ g.Expect(helpMsg).To(ContainSubstring("Flags:"))
})
t.Run("'bind' command help (long flag)", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "bind", "--help"))
- Expect(helpMsg).To(ContainSubstring("Bind Kubernetes resources, such as Kamelets, in an integration flow."))
- Expect(helpMsg).To(ContainSubstring("kamel bind [source] [sink] ... [flags]"))
- Expect(helpMsg).To(ContainSubstring("Global Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Bind Kubernetes resources, such as Kamelets, in an integration flow."))
+ g.Expect(helpMsg).To(ContainSubstring("kamel bind [source] [sink] ... [flags]"))
+ g.Expect(helpMsg).To(ContainSubstring("Global Flags:"))
})
}
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
index d2baf7c45..50258be0b 100644
--- a/e2e/common/cli/log_test.go
+++ b/e2e/common/cli/log_test.go
@@ -32,26 +32,26 @@ import (
)
func TestKamelCLILog(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("check integration log", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// first line of the integration logs
firstLine := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")[0]
podName := IntegrationPod(t, ns, "log-yaml")().Name
logsCLI := GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(firstLine))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(firstLine))
logs := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")
lastLine := logs[len(logs)-1]
logsCLI = GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns, "--tail", "5"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(lastLine))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(lastLine))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go
index 5a5e7d32d..6ee536e6d 100644
--- a/e2e/common/cli/offline_commands_test.go
+++ b/e2e/common/cli/offline_commands_test.go
@@ -26,33 +26,30 @@ import (
"io"
"testing"
- "github.com/stretchr/testify/assert"
-
. "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
)
func TestKamelVersionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
-
- assert.Nil(t, Kamel(t, "version", "--kube-config", "non-existent-kubeconfig-file").Execute())
+ g := NewWithT(t)
+ g.Expect(Kamel(t, "version", "--kube-config", "non-existent-kubeconfig-file").Execute()).To(Succeed())
}
func TestKamelHelpOptionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
traitCmd := Kamel(t, "run", "Xxx.java", "--help")
traitCmd.SetOut(io.Discard)
- assert.Nil(t, traitCmd.Execute())
+ g.Expect(traitCmd.Execute()).To(Succeed())
}
func TestKamelCompletionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
bashCmd := Kamel(t, "completion", "bash", "--kube-config", "non-existent-kubeconfig-file")
bashCmd.SetOut(io.Discard)
zshCmd := Kamel(t, "completion", "zsh", "--kube-config", "non-existent-kubeconfig-file")
zshCmd.SetOut(io.Discard)
- assert.Nil(t, bashCmd.Execute())
- assert.Nil(t, zshCmd.Execute())
+ g.Expect(bashCmd.Execute()).To(Succeed())
+ g.Expect(zshCmd.Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 7bcf6f7b6..bf95dc437 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -39,38 +39,38 @@ import (
var sampleJar = "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/traits/files/jvm/sample-1.0.jar"
func TestKamelCLIRun(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (RAW)", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java").Execute()).
To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (branch)", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// GIST does not like GITHUB_TOKEN apparently, we must temporarily remove it
@@ -79,26 +79,26 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Gist (ID)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-id")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Gist (URL)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-url")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"https://gist.github.com/lburgazzoli/e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Revert GITHUB TOKEN
@@ -106,80 +106,80 @@ func TestKamelCLIRun(t *testing.T) {
os.Unsetenv("GITHUB_TOKEN_TMP")
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run and update", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
// Re-run the Integration with an updated configuration
- Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
To(Succeed())
// Check the Deployment has progressed successfully
- Eventually(DeploymentCondition(t, ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
+ g.Eventually(DeploymentCondition(t, ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Check the new configuration is taken into account
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run with glob patterns", func(t *testing.T) {
t.Run("YAML", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("All", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
})
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The dependency cannot be read by maven while building. See #3708
@@ -192,19 +192,21 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
})
+
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The dependency cannot be read by maven while building. See #3708
@@ -217,18 +219,18 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
"-d", "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java|targetPath=/tmp/foo",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
}
diff --git a/e2e/common/cli/version_test.go b/e2e/common/cli/version_test.go
index 6b8e5deae..488ee7a03 100644
--- a/e2e/common/cli/version_test.go
+++ b/e2e/common/cli/version_test.go
@@ -32,10 +32,10 @@ import (
)
func TestKamelCLIVersion(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("check version correctness", func(t *testing.T) {
version := GetOutputString(Kamel(t, "version"))
- Expect(version).To(ContainSubstring(defaults.Version))
+ g.Expect(version).To(ContainSubstring(defaults.Version))
})
}
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index 9e0a3bcbf..a40361f6d 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -37,7 +37,7 @@ import (
func TestConfigmapHotReload(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
@@ -45,7 +45,7 @@ func TestConfigmapHotReload(t *testing.T) {
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm",
@@ -54,20 +54,20 @@ func TestConfigmapHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestConfigmapHotReloadDefault(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
@@ -75,26 +75,26 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm-2",
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestSecretHotReload(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-secret-route")
@@ -102,7 +102,7 @@ func TestSecretHotReload(t *testing.T) {
secData["my-secret-key"] = "very top secret"
CreatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy",
"--config",
"secret:my-hot-sec",
"-t",
@@ -110,15 +110,15 @@ func TestSecretHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
secData["my-secret-key"] = "very top secret updated"
UpdatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -131,11 +131,11 @@ func TestConfigmapWithOwnerRefHotReload(t *testing.T) {
}
func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
cmName := RandomizedSuffixName("my-hot-cm-")
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:"+cmName,
"--name",
@@ -144,19 +144,19 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
"mount.hot-reload="+strconv.FormatBool(hotreload),
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithOwnerRefWithLabels(t, ns, cmName, cmData, name, Integration(t, ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
if hotreload {
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
} else {
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index 0d8f8fb21..30fb00f3a 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -37,30 +37,30 @@ import (
func TestRunConfigExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Simple property", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
- Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property precedence", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
- Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
+ g.Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap", func(t *testing.T) {
@@ -68,11 +68,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.message"] = "my-configmap-property-value"
CreatePlainTextConfigmap(t, ns, "my-cm-test-property", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap as property file", func(t *testing.T) {
@@ -80,11 +80,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.properties"] = "my.message=my-configmap-property-entry"
CreatePlainTextConfigmap(t, ns, "my-cm-test-properties", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret", func(t *testing.T) {
@@ -92,11 +92,11 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.message"] = "my-secret-property-value"
CreatePlainTextSecret(t, ns, "my-sec-test-property", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret as property file", func(t *testing.T) {
@@ -104,10 +104,10 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.properties"] = "my.message=my-secret-property-entry"
CreatePlainTextSecret(t, ns, "my-sec-test-properties", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
})
t.Run("Property from Secret inlined", func(t *testing.T) {
@@ -116,23 +116,23 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextSecret(t, ns, "my-sec-inlined", secData)
// TODO: remove jvm.options trait as soon as CAMEL-20054 gets fixed
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-secret-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-secret-route.groovy",
"-t", "mount.configs=secret:my-sec-inlined",
"-t", "jvm.options=-Dcamel.k.mount-path.secrets=/etc/camel/conf.d/_secrets",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
+ g.Eventually(IntegrationPodPhase(t, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "property-secret-route")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "property-secret-route")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "property-secret-route")()
mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount")
- Expect(mountTrait).ToNot(BeNil())
- Expect(len(mountTrait)).To(Equal(1))
- Expect(mountTrait["configs"]).ToNot(BeNil())
+ g.Expect(mountTrait).ToNot(BeNil())
+ g.Expect(len(mountTrait)).To(Equal(1))
+ g.Expect(mountTrait["configs"]).ToNot(BeNil())
- Expect(Kamel(t, "delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
})
@@ -150,38 +150,38 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextConfigmap(t, ns, "my-cm-multi", cmDataMulti)
t.Run("Config configmap", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with destination", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with filtered key and destination", func(t *testing.T) {
// We'll use the configmap contaning 2 values filtering only 1 key
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
})
// Store a configmap as property file
@@ -190,10 +190,10 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextConfigmap(t, ns, "my-cm-properties", cmDataProps)
t.Run("Config configmap as property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
})
// Secret
@@ -210,65 +210,65 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextSecret(t, ns, "my-sec-multi", secDataMulti)
t.Run("Config secret", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
})
t.Run("Resource secret", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Secret with filtered key", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
- Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties
t.Run("Build time property", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
// Don't delete - we need it for next test execution
})
// We need to check also that the property (which is available in the IntegrationKit) is correctly replaced and we don't reuse the same kit
t.Run("Build time property updated", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
"--build-property", "quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
// Verify the integration kits are different
- Eventually(IntegrationKit(t, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ns, "build-property-route")()))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(IntegrationKit(t, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ns, "build-property-route")()))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties file
t.Run("Build time property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property file with precedence", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap", func(t *testing.T) {
@@ -276,11 +276,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["quarkus.application.name"] = "my-cool-application"
CreatePlainTextConfigmap(t, ns, "my-cm-test-build-property", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap as property file", func(t *testing.T) {
@@ -288,11 +288,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.properties"] = "quarkus.application.name=my-super-cool-application"
CreatePlainTextConfigmap(t, ns, "my-cm-test-build-properties", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
@@ -301,11 +301,11 @@ func TestRunConfigExamples(t *testing.T) {
secData["quarkus.application.name"] = "my-great-application"
CreatePlainTextSecret(t, ns, "my-sec-test-build-property", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
@@ -314,14 +314,14 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.properties"] = "quarkus.application.name=my-awsome-application"
CreatePlainTextSecret(t, ns, "my-sec-test-build-properties", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 21bb648eb..913a3f206 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -37,115 +37,115 @@ import (
func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int01")
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
"-p", "camel.kamelet.iconfig01-timer-source.message='Default message 01'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("Default message 01"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("Default message 01"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int3")
secretName := "my-iconfig-int3-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig03-timer-source.message"] = "very top mounted secret message"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int4")
cmName := "my-iconfig-int4-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig04-timer-source.message"] = "very top mounted configmap message"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted configmap message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted configmap message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int5")
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
"-p", "camel.kamelet.iconfig05-timer-source.message='Default message 05'",
"-p", "camel.kamelet.iconfig05-timer-source.mynamedconfig.message='My Named Config message'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My Named Config message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My Named Config message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int6")
secretName := "my-iconfig-int6-secret"
@@ -155,90 +155,90 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig06-timer-source"
labels["camel.apache.org/kamelet.configuration"] = "mynamedconfig"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
"-p", "camel.kamelet.iconfig06-timer-source.message='Default message 06'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int7")
secretName := "my-iconfig-int7-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig07-timer-source.mynamedconfig.message"] = "very top named mounted secret message"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
"-p", "camel.kamelet.iconfig07-timer-source.message='Default message 07'",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int8")
cmName := "my-iconfig-int8-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig08-timer-source.mynamedconfig.message"] = "very top named mounted configmap message"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
"-p", "camel.kamelet.iconfig08-timer-source.message='Default message 08'",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int9")
secretName := "my-iconfig-int9-secret"
@@ -247,83 +247,83 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
secData["camel.kamelet.iconfig09-timer-source.message"] = "very top labeled secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig09-timer-source"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top labeled secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top labeled secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
func TestKameletConfigInlinedUserPropery(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config inlined properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("important message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("integrationLogger"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("important message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("integrationLogger"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config parameters properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
"-p", "my-message='My parameter message 02'",
"-p", "my-logger='myIntegrationLogger02'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config secret properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int3")
secretName := "my-config-int3-secret"
@@ -331,31 +331,31 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "My secret message 03"
secData["my-logger"] = "mySecretIntegrationLogger03"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config configmap properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int4")
cmName := "my-config-int4-configmap"
@@ -363,21 +363,21 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
var cmData = make(map[string]string)
cmData["my-message"] = "My configmap message 04"
cmData["my-logger"] = "myConfigmapIntegrationLogger04"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index da50d115a..1e8af0462 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -35,25 +35,25 @@ import (
func TestPipeConfig(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("test custom source/sink pipe", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
t.Run("run test default config using properties", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-properties")
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "source.message=My pipe message",
"-p", "sink.loggerName=myPipeLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
})
t.Run("run test implicit default config using labeled secret", func(t *testing.T) {
@@ -64,20 +64,20 @@ func TestPipeConfig(t *testing.T) {
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "my-pipe-timer-source"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "sink.loggerName=myDefaultLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myDefaultLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myDefaultLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted secret", func(t *testing.T) {
@@ -87,20 +87,20 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
secData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted configmap", func(t *testing.T) {
@@ -110,20 +110,20 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe configmap message"
cmData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeConfigmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit named config using mounted secret", func(t *testing.T) {
@@ -133,9 +133,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named secret message"
secData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -144,12 +144,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit named config using mounted configmap", func(t *testing.T) {
@@ -159,9 +159,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named configmap message"
cmData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedConfigmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -170,12 +170,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted secret", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-secret")
@@ -184,9 +184,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["mynamedconfig.message"] = "My pipe specific secret message"
secData["mynamedconfig.loggerName"] = "myPipeSpecificSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -195,12 +195,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted configmap", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-configmap")
@@ -209,9 +209,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["mynamedconfig.message"] = "My pipe specific configmap message"
cmData["mynamedconfig.loggerName"] = "myPipeSpecificConfgmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -220,15 +220,15 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 75072d233..896a1c563 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleGroovyExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run groovy", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index fd17a6ff7..f631b985c 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleJavaExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run java", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 76fe2e706..ccdcbc465 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleJavaScriptExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run js", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 657ce5dba..5999058d6 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleKotlinExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run kotlin", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index ef55d16b8..0b4c52084 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -36,16 +36,16 @@ import (
func TestRunPolyglotExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run polyglot", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
- Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
+ g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 037768bf2..a4f9accd4 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleXmlExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run xml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 1d38e211e..107e32209 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleYamlExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go
index 41a2d3554..9a5f44739 100644
--- a/e2e/common/misc/client_test.go
+++ b/e2e/common/misc/client_test.go
@@ -41,7 +41,7 @@ import (
func TestClientFunctionalities(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
cfg, err := config.GetConfig()
require.NoError(t, err)
@@ -67,6 +67,6 @@ func TestClientFunctionalities(t *testing.T) {
err = camel.CamelV1().Integrations(ns).Delete(TestContext, "dummy", metav1.DeleteOptions{})
require.NoError(t, err)
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 42fb81171..fea57d999 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -36,43 +36,43 @@ import (
func TestRunCronExample(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("cron", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-timer", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-fallback", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-quartz", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index f74b22df5..8b8b03df2 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -37,152 +37,152 @@ import (
func TestBadRouteIntegration(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run bad java route", func(t *testing.T) {
name := RandomizedSuffixName("bad-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// Make sure the Integration can be scaled
- Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Check the Integration stays in error phase
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Kit valid
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
})
t.Run("run missing dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("java-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "mvn:com.example:nonexistent:1.0").Execute()).To(Succeed())
// Integration in error
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionKitAvailableReason)))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\"")))
// Kit in error
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
//Build in error with 5 attempts
build := Build(t, integrationKitNamespace, kitName)()
- Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
- Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
+ g.Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
+ g.Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
// Fixing the route should reconcile the Integration
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
- Expect(kitRecoveryName).NotTo(Equal(kitName))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Expect(kitRecoveryName).NotTo(Equal(kitName))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-dependency")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "camel:non-existent").Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
+ g.Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run unresolvable component java route", func(t *testing.T) {
name := RandomizedSuffixName("unresolvable-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
+ g.Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-java-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
// Kit valid
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Kit should not have changed
kitRecoveryName := IntegrationKit(t, ns, name)()
- Expect(kitRecoveryName).To(Equal(kitName))
+ g.Expect(kitRecoveryName).To(Equal(kitName))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 014c75bc6..4a8b7a374 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -36,21 +36,21 @@ import (
func TestTraitUpdates(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run and update trait", func(t *testing.T) {
name := RandomizedSuffixName("yaml-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
var numberOfPods = func(pods *int32) bool {
return *pods >= 1 && *pods <= 2
}
// Adding a property will change the camel trait
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
- Consistently(IntegrationPodsNumbers(t, ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
+ g.Consistently(IntegrationPodsNumbers(t, ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index 7b5a768f5..dcad2be56 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -35,7 +35,7 @@ import (
func TestKameletClasspathLoading(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Store a configmap on the cluster
var cmData = make(map[string]string)
@@ -114,24 +114,24 @@ spec:
// Basic
t.Run("test basic case", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
"--resource", "configmap:my-kamelet-cm@/kamelets",
"-p camel.component.kamelet.location=file:/kamelets",
"-d", "camel:yaml-dsl",
// kamelet dependencies
"-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "timer-kamelet-integration")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "timer-kamelet-integration")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "timer-kamelet-integration")()
kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets")
- Expect(kameletsTrait).ToNot(BeNil())
- Expect(len(kameletsTrait)).To(Equal(1))
- Expect(kameletsTrait["enabled"]).To(Equal(false))
+ g.Expect(kameletsTrait).ToNot(BeNil())
+ g.Expect(len(kameletsTrait)).To(Equal(1))
+ g.Expect(kameletsTrait["enabled"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 361eecb65..adc0a326f 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -37,17 +37,17 @@ const customLabel = "custom-label"
func TestBundleKameletUpdate(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
- Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
- Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
+ g.Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
+ g.Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
- Eventually(Kamelet(t, "my-http-sink", ns)).
+ g.Eventually(Kamelet(t, "my-http-sink", ns)).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Consistently(Kamelet(t, "user-sink", ns), 5*time.Second, 1*time.Second).
+ g.Consistently(Kamelet(t, "user-sink", ns), 5*time.Second, 1*time.Second).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index fee3ea655..c51e629bb 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -36,22 +36,22 @@ import (
func TestRunExtraRepository(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
"--dependency", "mvn:org.jolokia:jolokia-core:1.7.1.redhat-00001",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Integration(t, ns, name)).Should(WithTransform(IntegrationSpec, And(
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Integration(t, ns, name)).Should(WithTransform(IntegrationSpec, And(
HaveExistingField("Repositories"),
HaveField("Repositories", ContainElements("https://maven.repository.redhat.com/ga@id=redhat")),
)))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 07891d229..60abb04ba 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -37,15 +37,15 @@ import (
func TestPipe(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Error Handler testing
t.Run("test error handler", func(t *testing.T) {
- Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
+ g.Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
t.Run("throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -57,14 +57,14 @@ func TestPipe(t *testing.T) {
"--name", "throw-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationPodPhase(t, ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
t.Run("don't throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -76,19 +76,19 @@ func TestPipe(t *testing.T) {
"--name", "no-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationPodPhase(t, ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
})
//Pipe with traits testing
t.Run("test Pipe with trait", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"-p", "source.message=hello from test",
@@ -97,9 +97,9 @@ func TestPipe(t *testing.T) {
"--name", "kb-with-traits",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
- Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
+ g.Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
// Pipe with wrong spec
@@ -108,17 +108,17 @@ func TestPipe(t *testing.T) {
kb := v1.NewPipe(ns, name)
kb.Spec = v1.PipeSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(t), &kb)
- Eventually(err).Should(BeNil())
- Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(PipeCondition(t, ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
+ g.Eventually(err).Should(BeNil())
+ g.Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeCondition(t, ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 9173cefe7..aaf58b571 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -36,14 +36,14 @@ import (
func TestPipeWithImage(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
bindingID := "with-image-binding"
t.Run("run with initial image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.2"
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -54,24 +54,24 @@ func TestPipeWithImage(t *testing.T) {
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(t, ns, bindingID)).
+ g.Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
+ g.Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "1"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(t, ns, bindingID)).
+ g.Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(t, ns, bindingID)).
+ g.Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
t.Run("run with new image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.3"
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -81,20 +81,20 @@ func TestPipeWithImage(t *testing.T) {
"--annotation", "test=2",
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(t, ns, bindingID)).
+ g.Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
+ g.Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "2"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(t, ns, bindingID)).
+ g.Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(t, ns, bindingID)).
+ g.Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index bb8a39016..fe2b90f10 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -39,6 +39,7 @@ import (
func TestImageRegistryIsAMavenRepository(t *testing.T) {
t.Parallel()
+ g := NewWithT(t)
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
@@ -55,59 +56,59 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
"-d", fmt.Sprintf("file://%s", pom),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-default-path")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=/deployments/?filename=laugh.txt",
"-d", "file://files/registry/laugh.txt",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-custom-path")
customPath := "this/is/a/custom/path/"
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
"-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local directory is mounted in the integration container", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-directory")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=files/registry/",
"-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
})
t.Run("pom file is extracted from JAR", func(t *testing.T) {
@@ -116,28 +117,28 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("dependency can be used at build time", func(t *testing.T) {
// Create integration that should run an Xslt transformation whose template needs to be present at build time
name := RandomizedSuffixName("xslt")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
"-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index abe19d834..9a89ab154 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -40,37 +40,37 @@ import (
func TestRunRest(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Service works", func(t *testing.T) {
name := RandomizedSuffixName("John")
service := Service(t, ns, "rest-consumer")
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
- Expect(KamelRunWithID(t, operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
- Eventually(IntegrationLogs(t, ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
+ g.Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ g.Eventually(IntegrationLogs(t, ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
})
if ocp {
t.Run("Route works", func(t *testing.T) {
name := RandomizedSuffixName("Peter")
route := Route(t, ns, "rest-consumer")
- Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
- Eventually(RouteStatus(t, ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
+ g.Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(RouteStatus(t, ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
url := fmt.Sprintf("http://%s/customers/%s", route().Spec.Host, name)
- Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
- Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ g.Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
+ g.Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 49caec365..141839953 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -42,7 +42,7 @@ import (
func TestPipeScale(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
@@ -52,84 +52,84 @@ func TestPipeScale(t *testing.T) {
}
name := RandomizedSuffixName("timer2log")
- Expect(KamelBindWithID(t, operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
t.Run("Update Pipe scale spec", func(t *testing.T) {
- Expect(ScalePipe(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScalePipe(t, ns, name, 3)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check it also cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// Finally check the readiness condition becomes truthy back onPipe
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient(t).ScalesClient()
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
_, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("Pipes"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Finally check it cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("ScalePipe with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Getter
PipeScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
+ g.Expect(err).To(BeNil())
+ g.Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
+ g.Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
PipeScale.Spec.Replicas = 1
_, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, PipeScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling inPipe
- Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Pipe scale subresource Spec field
- Eventually(PipeSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index fdbc80288..3ba99050b 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -41,94 +41,93 @@ import (
func TestIntegrationScale(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
t.Run("Update integration scale spec", func(t *testing.T) {
- RegisterTestingT(t)
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("Scale integration with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient(t).ScalesClient()
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
_, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("integrations"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("Scale integration with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Getter
integrationScale, err := camel.CamelV1().Integrations(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
+ g.Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
integrationScale.Spec.Replicas = 1
integrationScale, err = camel.CamelV1().Integrations(ns).UpdateScale(TestContext, name, integrationScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
t.Run("Scale integration with external image", func(t *testing.T) {
image := IntegrationPodImage(t, ns, name)()
- Expect(image).NotTo(BeEmpty())
+ g.Expect(image).NotTo(BeEmpty())
// Save resources by deleting the integration
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
-
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(ScaleIntegration(t, ns, "pre-built", 0)).To(Succeed())
- Eventually(IntegrationPod(t, ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
- Expect(ScaleIntegration(t, ns, "pre-built", 1)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(ScaleIntegration(t, ns, "pre-built", 0)).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
+ g.Expect(ScaleIntegration(t, ns, "pre-built", 1)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ g.Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index a94925fcd..2182f4579 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -37,18 +37,18 @@ import (
func TestStructuredLogs(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "logging.format=json").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
pod := OperatorPod(t, opns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
@@ -56,14 +56,14 @@ func TestStructuredLogs(t *testing.T) {
Container: "camel-k-operator",
}
logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
- Expect(err).To(BeNil())
- Expect(logs).NotTo(BeEmpty())
+ g.Expect(err).To(BeNil())
+ g.Expect(logs).NotTo(BeEmpty())
it := Integration(t, ns, name)()
- Expect(it).NotTo(BeNil())
+ g.Expect(it).NotTo(BeNil())
build := Build(t, IntegrationKitNamespace(t, ns, name)(), IntegrationKit(t, ns, name)())()
- Expect(build).NotTo(BeNil())
+ g.Expect(build).NotTo(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 57442e03e..af9b9bd22 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -36,41 +36,41 @@ import (
func TestSourceLessIntegrations(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
var cmData = make(map[string]string)
cmData["my-file.txt"] = "Hello World!"
CreatePlainTextConfigmap(t, ns, "my-cm-sourceless", cmData)
t.Run("Camel Main", func(t *testing.T) {
itName := "my-camel-main-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
})
t.Run("Camel Spring Boot", func(t *testing.T) {
itName := "my-camel-sb-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
})
t.Run("Camel Quarkus", func(t *testing.T) {
itName := "my-camel-quarkus-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/setup/main_test.go
index a384c9e60..d303f2483 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/setup/main_test.go
@@ -50,12 +50,8 @@ func TestMain(m *testing.M) {
})
var t *testing.T
+
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
- // Adjust global operator integration platform settings
- // Tests are run in parallel so need to choose a proper build order strategy
- pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyDependencies
- })).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 6725dda04..c61cf6cb3 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -39,7 +39,7 @@ import (
func TestAffinityTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
var hostname string
if node, err := selectSchedulableNode(t); err == nil {
@@ -52,72 +52,72 @@ func TestAffinityTrait(t *testing.T) {
if hostname != "" {
t.Run("Run Java with node affinity", func(t *testing.T) {
name1 := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name1,
"-t", "affinity.enabled=true",
"-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name1)()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname),
}))
- Expect(pod.Spec.NodeName).To(Equal(hostname))
+ g.Expect(pod.Spec.NodeName).To(Equal(hostname))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name1)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name1)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name1)()
affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity")
- Expect(affinityTrait).NotTo(BeNil())
- Expect(len(affinityTrait)).To(Equal(2))
- Expect(affinityTrait["enabled"]).To(Equal(true))
- Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
+ g.Expect(affinityTrait).NotTo(BeNil())
+ g.Expect(len(affinityTrait)).To(Equal(2))
+ g.Expect(affinityTrait["enabled"]).To(Equal(true))
+ g.Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
t.Run("Run Java with pod affinity", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java2",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, "java2")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
},
}))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run Java with pod anti affinity", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java3",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, "java3")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
},
}))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index c1f9323c2..3f0ea3650 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -38,98 +38,98 @@ import (
func TestBuilderTrait(t *testing.T) {
// Test not able to run in parallel because of maven profile tests
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run build strategy routine", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=sequential",
"-t", "builder.strategy=routine").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy dependencies", func(t *testing.T) {
name := RandomizedSuffixName("java-dependencies-strategy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=dependencies").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder")
- Expect(builderTrait).NotTo(BeNil())
- Expect(len(builderTrait)).To(Equal(1))
- Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
+ g.Expect(builderTrait).NotTo(BeNil())
+ g.Expect(len(builderTrait)).To(Equal(1))
+ g.Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy fifo", func(t *testing.T) {
name := RandomizedSuffixName("java-fifo-strategy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=fifo").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java-resource-config")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks-request-cpu=builder:500m",
"-t", "builder.tasks-limit-cpu=builder:1000m",
@@ -138,100 +138,100 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
// Let's assert we set the resources on the builder container
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task", func(t *testing.T) {
name := RandomizedSuffixName("java-pipeline")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;tree",
"-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task error", func(t *testing.T) {
name := RandomizedSuffixName("java-error")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;cat missingfile.txt",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildConditions(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(BuildConditions(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(
+ g.Eventually(
BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
TestTimeoutShort).Should(ContainSubstring("No such file or directory"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run maven profile", func(t *testing.T) {
@@ -239,11 +239,11 @@ func TestBuilderTrait(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
mavenProfile1Cm := newMavenProfileConfigMap(opns, "maven-profile-owasp", "owasp-profile")
- Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
mavenProfile2Cm := newMavenProfileConfigMap(opns, "maven-profile-dependency", "dependency-profile")
- Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile",
"-t", "builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
@@ -251,35 +251,35 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, mavenProfile1Cm)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, mavenProfile2Cm)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, mavenProfile1Cm)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, mavenProfile2Cm)).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index c2cd82432..eecb232bc 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -36,37 +36,37 @@ import (
func TestCamelTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("properties changes should not rebuild", func(t *testing.T) {
- Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
// checking the integration status
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKit := IntegrationKit(t, ns, name)()
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-p", "a=1",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationKit(t, ns, name)).Should(Equal(integrationKit))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationKit(t, ns, name)).Should(Equal(integrationKit))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
})
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index d3ff9cc89..3669b90b1 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -37,11 +37,11 @@ import (
func TestContainerTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.image-pull-policy=Always",
"-t", "container.request-cpu=0.005",
"-t", "container.request-memory=100Mi",
@@ -49,17 +49,17 @@ func TestContainerTrait(t *testing.T) {
"-t", "container.limit-memory=500Mi",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
imagePullPolicy := pod.Spec.Containers[0].ImagePullPolicy
return imagePullPolicy == "Always"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -67,7 +67,7 @@ func TestContainerTrait(t *testing.T) {
requestsCpu := pod.Spec.Containers[0].Resources.Requests.Cpu()
return limitsCpu != nil && limitsCpu.String() == "200m" && requestsCpu != nil && requestsCpu.String() == "5m"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -81,14 +81,14 @@ func TestContainerTrait(t *testing.T) {
t.Run("Container name", func(t *testing.T) {
name := RandomizedSuffixName("java2")
containerName := "my-container-name"
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.name="+containerName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -97,16 +97,16 @@ func TestContainerTrait(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container")
- Expect(containerTrait).ToNot(BeNil())
- Expect(len(containerTrait)).To(Equal(1))
- Expect(containerTrait["name"]).To(Equal(containerName))
+ g.Expect(containerTrait).ToNot(BeNil())
+ g.Expect(len(containerTrait)).To(Equal(1))
+ g.Expect(containerTrait["name"]).To(Equal(containerName))
})
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index d8dd0310a..6021b70a7 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -40,20 +40,20 @@ import (
func TestRecreateDeploymentStrategyTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(t, ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -66,32 +66,32 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment")
- Expect(deploymentTrait).ToNot(BeNil())
- Expect(len(deploymentTrait)).To(Equal(1))
- Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
+ g.Expect(deploymentTrait).ToNot(BeNil())
+ g.Expect(len(deploymentTrait)).To(Equal(1))
+ g.Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "deployment.strategy="+string(appsv1.RollingUpdateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(t, ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -104,6 +104,6 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 316f8d233..59d3bf530 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -36,21 +36,21 @@ import (
func TestErrorHandlerTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run errored integration with error handler", func(t *testing.T) {
name := RandomizedSuffixName("error-handler")
- Expect(KamelRunWithID(t, operatorID, ns, "files/ErroredRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/ErroredRoute.java",
"--name", name,
"-t", "error-handler.enabled=true",
"-t", "error-handler.ref=defaultErrorHandler",
"-p", "camel.beans.defaultErrorHandler=#class:org.apache.camel.builder.DeadLetterChannelBuilder",
"-p", "camel.beans.defaultErrorHandler.deadLetterUri=log:my-special-error-handler-in-place?level=ERROR&showCaughtException=false&showBody=false&showBodyType=false&showExchangePattern=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
})
})
}
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 9ee4388eb..4f127df88 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -36,17 +36,17 @@ import (
func TestErroredTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Integration trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("it-errored")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
@@ -54,28 +54,28 @@ func TestErroredTrait(t *testing.T) {
t.Run("Pipe trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("kb-errored")
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar",
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
// Pipe
- Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(PipeCondition(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
+ g.Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(PipeCondition(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
)))
// Integration related
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 62403812f..658c66535 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -45,11 +45,11 @@ import (
func TestHealthTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -58,30 +58,30 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health")
- Expect(healthTrait).ToNot(BeNil())
- Expect(len(healthTrait)).To(Equal(1))
- Expect(healthTrait["enabled"]).To(Equal(true))
+ g.Expect(healthTrait).ToNot(BeNil())
+ g.Expect(len(healthTrait)).To(Equal(1))
+ g.Expect(healthTrait["enabled"]).To(Equal(true))
pods := IntegrationPods(t, ns, name)()
@@ -93,24 +93,24 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal(fmt.Sprintf("%d/3 pods are not ready", i+1)))))
}
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -147,15 +147,15 @@ func TestHealthTrait(t *testing.T) {
return true
}))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped route", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -164,11 +164,11 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
@@ -179,17 +179,17 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
@@ -204,11 +204,11 @@ func TestHealthTrait(t *testing.T) {
// status: "False"
// type: Ready
//
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -241,10 +241,10 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped"
}))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped binding", func(t *testing.T) {
@@ -252,10 +252,10 @@ func TestHealthTrait(t *testing.T) {
source := RandomizedSuffixName("my-health-timer-source")
sink := RandomizedSuffixName("my-health-log-sink")
- Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
source,
sink,
"-p", "source.message=Magicstring!",
@@ -267,10 +267,10 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
@@ -281,26 +281,26 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -333,7 +333,7 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(PipeCondition(t, ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ g.Eventually(PipeCondition(t, ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *camelv1.PipeCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -367,31 +367,31 @@ func TestHealthTrait(t *testing.T) {
}))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteKamelet(t, ns, source)).To(Succeed())
- Expect(DeleteKamelet(t, ns, sink)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, source)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, sink)).To(Succeed())
})
t.Run("Readiness condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("never-ready")
- Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
// Check that the error message is propagated from health checks even if deployment never becomes ready
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -428,23 +428,23 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-never-ready-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -490,17 +490,17 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-ready-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 ready replicas"))))
@@ -513,6 +513,6 @@ func TestHealthTrait(t *testing.T) {
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index c66019349..3a80c4278 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -37,33 +37,33 @@ import (
func TestIstioTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with Istio", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "istio.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
+ g.Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
annotations := pod.ObjectMeta.Annotations
- Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
- Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
+ g.Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
+ g.Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio")
- Expect(istioTrait).ToNot(BeNil())
- Expect(len(istioTrait)).To(Equal(1))
- Expect(istioTrait["enabled"]).To(Equal(true))
+ g.Expect(istioTrait).ToNot(BeNil())
+ g.Expect(len(istioTrait)).To(Equal(1))
+ g.Expect(istioTrait["enabled"]).To(Equal(true))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index d43c9385d..97dd558a7 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -38,39 +38,39 @@ import (
func TestJolokiaTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with Jolokia", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "jolokia.enabled=true",
"-t", "jolokia.use-ssl-client-authentication=false",
"-t", "jolokia.protocol=http",
"-t", "jolokia.extended-client-check=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)
response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia")
- Expect(jolokiaTrait).ToNot(BeNil())
- Expect(len(jolokiaTrait)).To(Equal(4))
- Expect(jolokiaTrait["enabled"]).To(Equal(true))
- Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
- Expect(jolokiaTrait["protocol"]).To(Equal("http"))
- Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
+ g.Expect(jolokiaTrait).ToNot(BeNil())
+ g.Expect(len(jolokiaTrait)).To(Equal(4))
+ g.Expect(jolokiaTrait["enabled"]).To(Equal(true))
+ g.Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
+ g.Expect(jolokiaTrait["protocol"]).To(Equal("http"))
+ g.Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 6ea2dc89b..87fc90cdd 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -39,7 +39,7 @@ import (
func TestJVMTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Store a configmap holding a jar
var cmData = make(map[string][]byte)
@@ -51,23 +51,23 @@ func TestJVMTrait(t *testing.T) {
require.NoError(t, err)
t.Run("JVM trait classpath", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/jvm/Classpath.java",
"--resource", "configmap:my-deps",
"-t", "jvm.classpath=/etc/camel/resources/my-deps/sample-1.0.jar",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "classpath")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "classpath")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "classpath")()
jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm")
- Expect(jvmTrait).ToNot(BeNil())
- Expect(len(jvmTrait)).To(Equal(1))
- Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
+ g.Expect(jvmTrait).ToNot(BeNil())
+ g.Expect(len(jvmTrait)).To(Equal(1))
+ g.Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index a0476a662..31e27323a 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -36,7 +36,7 @@ import (
func TestKameletTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("discover kamelet capabilities", func(t *testing.T) {
template := map[string]interface{}{
@@ -49,22 +49,22 @@ func TestKameletTrait(t *testing.T) {
},
},
}
- Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
+ g.Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
name := RandomizedSuffixName("webhook")
- Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
// Verify Integration capabilities
- Eventually(IntegrationStatusCapabilities(t, ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
+ g.Eventually(IntegrationStatusCapabilities(t, ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
// Verify expected resources from Kamelet (Service in this case)
service := Service(t, ns, name)
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
})
// Clean-up
- Expect(DeleteKamelet(t, ns, "capabilities-webhook-source")).To(Succeed())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "capabilities-webhook-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index bd5980872..ce52fb46c 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -37,48 +37,48 @@ import (
func TestMasterTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("master works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("only one integration with master runs", func(t *testing.T) {
nameFirst := RandomizedSuffixName("first")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameFirst,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Start a second integration with the same lock (it should not start the route)
nameSecond := RandomizedSuffixName("second")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameSecond,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "master.resource-name=first-lock",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
- Eventually(IntegrationLogs(t, ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
+ g.Eventually(IntegrationLogs(t, ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, nameFirst)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, nameFirst)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, nameFirst)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master")
- Expect(builderTrait).ToNot(BeNil())
- Expect(len(builderTrait)).To(Equal(2))
- Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
- Expect(builderTrait["labelValue"]).To(Equal("same"))
+ g.Expect(builderTrait).ToNot(BeNil())
+ g.Expect(len(builderTrait)).To(Equal(2))
+ g.Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
+ g.Expect(builderTrait["labelValue"]).To(Equal("same"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 8036058a8..afd60051a 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -37,7 +37,7 @@ import (
func TestOpenAPI(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
require.NoError(t, err)
@@ -45,24 +45,24 @@ func TestOpenAPI(t *testing.T) {
cmDataProps["petstore-api.yaml"] = string(openapiContent)
CreatePlainTextConfigmap(t, ns, "my-openapi", cmDataProps)
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"--name", "petstore",
"--open-api", "configmap:my-openapi",
"files/openapi/petstore.groovy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "petstore"), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, "petstore"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(DeploymentWithIntegrationLabel(t, ns, "petstore"), TestTimeoutLong).
+ g.Eventually(DeploymentWithIntegrationLabel(t, ns, "petstore"), TestTimeoutLong).
Should(Not(BeNil()))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started listPets (rest://get:/v1:/pets)"))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started createPets (rest://post:/v1:/pets)"))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started showPetById (rest://get:/v1:/pets/%7BpetId%7D)"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index d8d0a7759..a3cb8e803 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -45,35 +45,35 @@ import (
func TestPodDisruptionBudgetTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "pdb.enabled=true",
"-t", "pdb.min-available=2",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb")
- Expect(pdbTrait).ToNot(BeNil())
- Expect(len(pdbTrait)).To(Equal(2))
- Expect(pdbTrait["enabled"]).To(Equal(true))
- Expect(pdbTrait["minAvailable"]).To(Equal("2"))
+ g.Expect(pdbTrait).ToNot(BeNil())
+ g.Expect(len(pdbTrait)).To(Equal(2))
+ g.Expect(pdbTrait["enabled"]).To(Equal(true))
+ g.Expect(pdbTrait["minAvailable"]).To(Equal("2"))
// Check PodDisruptionBudget
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).ShouldNot(BeNil())
pdb := podDisruptionBudget(t, ns, name)()
// Assert PDB Spec
- Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
+ g.Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
// Assert PDB Status
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -85,17 +85,17 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
}))
// Scale Integration
- Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
- Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(2))
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(2))
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 2)))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
// Check PodDisruptionBudget
pdb = podDisruptionBudget(t, ns, name)()
- Expect(pdb).NotTo(BeNil())
+ g.Expect(pdb).NotTo(BeNil())
// Assert PDB Status according to the scale change
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -108,13 +108,13 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Eviction attempt
pods := IntegrationPods(t, ns, name)()
- Expect(pods).To(HaveLen(2))
+ g.Expect(pods).To(HaveLen(2))
err := TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
})
- Expect(err).To(MatchError(&k8serrors.StatusError{
+ g.Expect(err).To(MatchError(&k8serrors.StatusError{
ErrStatus: metav1.Status{
Status: "Failure",
Message: "Cannot evict pod as it would violate the pod's disruption budget.",
@@ -133,22 +133,22 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Scale Integration to Scale > PodDisruptionBudgetSpec.MinAvailable
// for the eviction request to succeed once replicas are ready
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
- Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(3))
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(3))
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 3)))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
pods = IntegrationPods(t, ns, name)()
- Expect(pods).To(HaveLen(3))
- Expect(TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ g.Expect(pods).To(HaveLen(3))
+ g.Expect(TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
})).To(Succeed())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index a8f0d6b99..66360f55f 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -36,7 +36,7 @@ import (
func TestPodTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
tc := []struct {
name string
@@ -49,14 +49,14 @@ func TestPodTrait(t *testing.T) {
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
// check that integrations is working and reading data created by sidecar container
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
// check that env var is injected
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
pod := IntegrationPod(t, ns, name)()
// check if ENV variable is applied
envValue := getEnvVar("TEST_VARIABLE", pod.Spec)
- Expect(envValue).To(Equal("hello from the template"))
+ g.Expect(envValue).To(Equal("hello from the template"))
},
},
{
@@ -64,7 +64,7 @@ func TestPodTrait(t *testing.T) {
templateName: "files/template-with-supplemental-groups.yaml",
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if pod.Spec.SecurityContext == nil {
return false
}
@@ -85,23 +85,23 @@ func TestPodTrait(t *testing.T) {
test := tc[i]
t.Run(test.name, func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PodTest.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PodTest.groovy",
"--name", name,
"--pod-template", test.templateName,
).Execute()).To(Succeed())
// check integration is deployed
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
test.assertions(t, ns, name)
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index aa359e0bc..b2ad103f5 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -45,27 +45,27 @@ import (
func TestPrometheusTrait(t *testing.T) {
// test not able to run in parallel
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
// Do not create PodMonitor for the time being as CI test runs on OCP 3.11
createPodMonitor := false
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "prometheus.enabled=true",
"-t", fmt.Sprintf("prometheus.pod-monitor=%v", createPodMonitor)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "java")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "java")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "java")()
prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus")
- Expect(prometheusTrait).ToNot(BeNil())
- Expect(len(prometheusTrait)).To(Equal(2))
- Expect(prometheusTrait["enabled"]).To(Equal(true))
- Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
+ g.Expect(prometheusTrait).ToNot(BeNil())
+ g.Expect(len(prometheusTrait)).To(Equal(2))
+ g.Expect(prometheusTrait["enabled"]).To(Equal(true))
+ g.Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
t.Run("Metrics endpoint works", func(t *testing.T) {
pod := IntegrationPod(t, ns, "java")
response, err := TestClient(t).CoreV1().RESTClient().Get().
@@ -79,11 +79,11 @@ func TestPrometheusTrait(t *testing.T) {
if ocp && createPodMonitor {
t.Run("PodMonitor is created", func(t *testing.T) {
sm := podMonitor(t, ns, "java")
- Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index a2e2f5499..d8ec4fb20 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -38,46 +38,46 @@ import (
func TestPullSecretTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
t.Run("Image pull secret is set on pod", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=true",
"-t", "pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
// pod may not run because the pull secret is dummy
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
})
t.Run("Explicitly disable image pull secret", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret")
- Expect(pullSecretTrait).ToNot(BeNil())
- Expect(len(pullSecretTrait)).To(Equal(1))
- Expect(pullSecretTrait["enabled"]).To(Equal(false))
+ g.Expect(pullSecretTrait).ToNot(BeNil())
+ g.Expect(len(pullSecretTrait)).To(Equal(1))
+ g.Expect(pullSecretTrait["enabled"]).To(Equal(false))
pod := IntegrationPod(t, ns, name)()
if ocp {
// OpenShift `default` service account has imagePullSecrets so it's always set
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
} else {
- Expect(pod.Spec.ImagePullSecrets).To(BeNil())
+ g.Expect(pod.Spec.ImagePullSecrets).To(BeNil())
}
})
@@ -85,18 +85,18 @@ func TestPullSecretTrait(t *testing.T) {
// OpenShift always has an internal registry so image pull secret is set by default
t.Run("Image pull secret is automatically set by default", func(t *testing.T) {
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
})
}
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index c192aae1f..52807a0b8 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -73,7 +73,7 @@ var skipClientTLSVerification = true
func TestRunRoutes(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
if !ocp {
@@ -83,7 +83,7 @@ func TestRunRoutes(t *testing.T) {
require.NoError(t, err)
operatorID := "camel-k-trait-route"
- Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
// create a test secret of type tls with certificates
// this secret is used to setupt the route TLS object across diferent tests
@@ -98,60 +98,60 @@ func TestRunRoutes(t *testing.T) {
// Insecure Route / No TLS
// =============================
t.Run("Route unsecure http works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before doing an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("http://%s/hello?name=Simple", route().Spec.Host)
- Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge
// =============================
t.Run("Route Edge https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("https://%s/hello?name=TLS_Edge", route().Spec.Host)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge with custom certificate
// =============================
t.Run("Route Edge (custom certificate) https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.tls-termination=edge",
"-t", "route.tls-certificate-secret="+refCert,
"-t", "route.tls-key-secret="+refKey,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_EdgeCustomCertificate"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Passthrough
// =============================
t.Run("Route passthrough https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -160,23 +160,23 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-termination=passthrough",
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_Passthrough"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Reencrypt
// =============================
t.Run("Route Reencrypt https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -189,42 +189,42 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-key-secret="+refKey,
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_Reencrypt"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
t.Run("Route annotations added", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.annotations.'haproxy.router.openshift.io/balance'=roundrobin").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := RouteFull(t, ns, integrationName)()
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
var annotations = route.ObjectMeta.Annotations
- Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
+ g.Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, integrationName)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, integrationName)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, integrationName)()
routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route")
- Expect(routeTrait).ToNot(BeNil())
- Expect(len(routeTrait)).To(Equal(1))
- Expect(routeTrait["enabled"]).To(Equal(true))
+ g.Expect(routeTrait).ToNot(BeNil())
+ g.Expect(len(routeTrait)).To(Equal(1))
+ g.Expect(routeTrait["enabled"]).To(Equal(true))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
- Expect(TestClient(t).Delete(TestContext, &secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, &secret)).To(Succeed())
})
}
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 45ddeae49..656b90360 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -38,7 +38,7 @@ import (
func TestServiceBindingTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Integration Service Binding", func(t *testing.T) {
// Create our mock service config
@@ -63,17 +63,17 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Create integration and bind it to our service
name := RandomizedSuffixName("service-binding")
- Expect(KamelRunWithID(t, operatorID, ns, "files/ServiceBinding.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/ServiceBinding.java",
"--name", name,
"--connect", serviceRef,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
})
t.Run("Binding Service Binding", func(t *testing.T) {
@@ -96,16 +96,16 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
- Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
"-p", "source.message=Hello+world",
"--connect", serviceRef).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
+ g.Eventually(IntegrationPodPhase(t, ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index ad40c9783..02f486610 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -36,89 +36,89 @@ import (
func TestServiceTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("NodePort service", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.node-port=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Default service (ClusterIP)", func(t *testing.T) {
// Service trait is enabled by default
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("NodePort service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=NodePort").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("ClusterIP service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=ClusterIP").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "platform-http-server")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "platform-http-server")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "platform-http-server")()
serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service")
- Expect(serviceTrait).ToNot(BeNil())
- Expect(len(serviceTrait)).To(Equal(2))
- Expect(serviceTrait["enabled"]).To(Equal(true))
- Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
+ g.Expect(serviceTrait).ToNot(BeNil())
+ g.Expect(len(serviceTrait)).To(Equal(2))
+ g.Expect(serviceTrait["enabled"]).To(Equal(true))
+ g.Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("LoadBalancer service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=LoadBalancer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index c57eb4544..2bd3050a8 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -38,23 +38,23 @@ import (
func TestTolerationTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
+ g.Expect(pod.Spec.Tolerations).NotTo(BeNil())
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoExecute,
@@ -64,19 +64,19 @@ func TestTolerationTrait(t *testing.T) {
t.Run("Run Java with node toleration operation equals", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master=test:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
+ g.Expect(pod.Spec.Tolerations).NotTo(BeNil())
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpEqual,
Value: "test", Effect: corev1.TaintEffectNoExecute,
@@ -90,7 +90,7 @@ func TestTolerationTrait(t *testing.T) {
}
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
// Use the affinity trait to force the scheduling of the Integration pod onto a master node
"-t", "affinity.enabled=true",
@@ -100,23 +100,23 @@ func TestTolerationTrait(t *testing.T) {
"-t", "toleration.taints=node-role.kubernetes.io/master:NoSchedule",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// Check the Integration pod contains the toleration
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "node-role.kubernetes.io/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
}))
// Check the Integration pod is running on a master node
- Expect(Node(t, pod.Spec.NodeName)()).NotTo(BeNil())
- Expect(Node(t, pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
+ g.Expect(Node(t, pod.Spec.NodeName)()).NotTo(BeNil())
+ g.Expect(Node(t, pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
"Spec": MatchFields(IgnoreExtras, Fields{
"Taints": ContainElement(corev1.Taint{
Key: "node-role.kubernetes.io/master",
@@ -127,6 +127,6 @@ func TestTolerationTrait(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index e01ce9d3f..5becde9c3 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -32,42 +32,42 @@ import (
)
func TestRunGlobalKamelet(t *testing.T) {
- WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
+ WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
operatorID := "camel-k-global-kamelet"
- Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
t.Run("Global operator + namespaced kamelet test", func(t *testing.T) {
// NS2: namespace without operator
- WithNewTestNamespace(t, func(ns2 string) {
- Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
+ g.Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
})
})
t.Run("Global operator + global kamelet test", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
// NS3: namespace without operator
- WithNewTestNamespace(t, func(ns3 string) {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
-
- Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, Kamelet(t, "my-own-timer-source", operatorNamespace)())).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns3 string) {
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, Kamelet(t, "my-own-timer-source", operatorNamespace)())).To(Succeed())
})
})
- Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index 76d1cb396..c0f3cb05d 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -40,91 +40,89 @@ import (
)
func TestRunGlobalInstall(t *testing.T) {
- RegisterTestingT(t)
-
- WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
- Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
- Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
+ g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
t.Run("Global CamelCatalog reconciliation", func(t *testing.T) {
- Eventually(Platform(t, operatorNamespace)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Eventually(Platform(t, operatorNamespace)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(t, operatorNamespace, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalog(t, operatorNamespace, catalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
t.Run("Global test on namespace with platform", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns2 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
// Creating namespace local platform
- Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Eventually(Platform(t, ns2)).ShouldNot(BeNil())
+ g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns2)).ShouldNot(BeNil())
// Run with global operator id
- Expect(KamelRun(t, ns2, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
+ g.Expect(KamelRun(t, ns2, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
kit := IntegrationKit(t, ns2, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
- Expect(Kits(t, ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- Expect(Lease(t, ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
})
})
t.Run("Global test on namespace with its own operator", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns3 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns3 string) {
operatorID := "camel-k-local-ns3"
if NoOlmOperatorImage != "" {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
}
- Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
+ g.Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
kit := IntegrationKit(t, ns3, "java")()
- Expect(Kits(t, ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
- Expect(Lease(t, ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
- Expect(Lease(t, ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
+ g.Expect(Lease(t, ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
"Controller Runtime is expected to use Leases for leader election: if this changes we should update our locking logic",
)
})
})
t.Run("Global test on namespace without platform", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns4 string) {
- Expect(KamelRun(t, ns4, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ WithNewTestNamespace(t, func(g *WithT, ns4 string) {
+ g.Expect(KamelRun(t, ns4, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
kit := IntegrationKit(t, ns4, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns4).Execute()).To(Succeed())
- Expect(Kits(t, ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns4).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
- Expect(Lease(t, ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
t.Run("Global test on namespace without platform with external kit", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns5 string) {
- Expect(KamelRun(t, ns5, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ WithNewTestNamespace(t, func(g *WithT, ns5 string) {
+ g.Expect(KamelRun(t, ns5, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
kit := IntegrationKit(t, ns5, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
globalKits := Kits(t, operatorNamespace)()
- Expect(globalKits).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Reusing the same global kit
+ g.Expect(globalKits).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Reusing the same global kit
// external kit mirroring the global one
externalKit := v1.IntegrationKit{
@@ -139,21 +137,21 @@ func TestRunGlobalInstall(t *testing.T) {
Image: getKitImage(t, operatorNamespace, kit),
},
}
- Expect(TestClient(t).Create(TestContext, &externalKit)).Should(BeNil())
+ g.Expect(TestClient(t).Create(TestContext, &externalKit)).Should(BeNil())
- Expect(KamelRun(t, ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationKit(t, ns5, "ext")()).Should(Equal("external"))
- Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
+ g.Expect(KamelRun(t, ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationKit(t, ns5, "ext")()).Should(Equal("external"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
- Expect(Lease(t, ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
- Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index 2cf087e7a..35fdb2e84 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -47,30 +47,30 @@ import (
)
func TestBasicInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Check if file exists in operator pod
- Expect(OperatorPod(t, ns)().Name).NotTo(Equal(""))
- Expect(OperatorPod(t, ns)().Spec.Containers[0].Name).NotTo(Equal(""))
+ g.Expect(OperatorPod(t, ns)().Name).NotTo(Equal(""))
+ g.Expect(OperatorPod(t, ns)().Spec.Containers[0].Name).NotTo(Equal(""))
req := TestClient(t).CoreV1().RESTClient().Post().
Resource("pods").
@@ -89,7 +89,7 @@ func TestBasicInstallation(t *testing.T) {
}, scheme.ParameterCodec)
exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// returns an error if file does not exists
execErr := exec.Stream(remotecommand.StreamOptions{
@@ -97,38 +97,38 @@ func TestBasicInstallation(t *testing.T) {
Stderr: os.Stderr,
Tty: false,
})
- Expect(execErr).To(BeNil())
+ g.Expect(execErr).To(BeNil())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestAlternativeImageInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
- Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
+ g.Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
})
}
func TestKitMainInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
- Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
})
}
func TestMavenRepositoryInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
configmapName := fmt.Sprintf("%s-maven-settings", operatorID)
- Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
- Eventually(func() string {
+ g.Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
+ g.Eventually(func() string {
return Configmap(t, ns, configmapName)().Data["settings.xml"]
}).Should(ContainSubstring("https://my.repo.org/public/"))
})
@@ -139,11 +139,11 @@ func TestMavenRepositoryInstallation(t *testing.T) {
* so the Platform will have an empty Registry structure
*/
func TestSkipRegistryInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(func() v1.RegistrySpec {
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(func() v1.RegistrySpec {
return Platform(t, ns)().Spec.Build.Registry
}, TestTimeoutMedium).Should(Equal(v1.RegistrySpec{}))
})
@@ -173,16 +173,16 @@ func TestConsoleCliDownload(t *testing.T) {
templt, err := template.New("downloadLink").Parse(downloadUrlTemplate)
require.NoError(t, err)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// make sure there is no preinstalled CliDownload resource
cliDownload := ConsoleCLIDownload(t, name)()
if cliDownload != nil {
- Expect(TestClient(t).Delete(TestContext, cliDownload)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, cliDownload)).To(Succeed())
}
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
cliDownload = ConsoleCLIDownload(t, name)()
links := cliDownload.Spec.Links
@@ -198,25 +198,25 @@ func TestConsoleCliDownload(t *testing.T) {
}
templt.Execute(&buf, args)
- Expect(link.Href).To(MatchRegexp(buf.String()))
+ g.Expect(link.Href).To(MatchRegexp(buf.String()))
}
})
}
func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Expect(KameletList(t, ns)()).Should(BeEmpty())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KameletList(t, ns)()).Should(BeEmpty())
})
}
func TestInstallDebugLogging(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
- Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
+ g.Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
})
}
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index 337cc3c52..e5096735c 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -56,7 +56,7 @@ import (
)
func TestMavenCASecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
hostname := fmt.Sprintf("%s.%s.svc", "nexus", ns)
tlsMountPath := "/etc/tls/private"
@@ -77,7 +77,7 @@ func TestMavenCASecret(t *testing.T) {
// generate certPem private key
certPrivateKey, err := rsa.GenerateKey(rand.Reader, 2048)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
privateKeyBytes := x509.MarshalPKCS1PrivateKey(certPrivateKey)
// encode for storing into secret
@@ -88,7 +88,7 @@ func TestMavenCASecret(t *testing.T) {
},
)
certBytes, err := x509.CreateCertificate(rand.Reader, cert, cert, &certPrivateKey.PublicKey, certPrivateKey)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// encode for storing into secret
certPem := pem.EncodeToMemory(&pem.Block{
@@ -111,7 +111,7 @@ func TestMavenCASecret(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD configuration
config := &corev1.ConfigMap{
@@ -179,7 +179,7 @@ ProxyPreserveHost On
),
},
}
- Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// Deploy Nexus
// https://help.sonatype.com/repomanager3/installation/run-behind-a-reverse-proxy
@@ -296,7 +296,7 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := &corev1.Service{
TypeMeta: metav1.TypeMeta{
@@ -318,10 +318,10 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -337,11 +337,11 @@ ProxyPreserveHost On
APIVersion: corev1.SchemeGroupVersion.String(),
},
}
- Expect(TestClient(t).List(TestContext, pods,
+ g.Expect(TestClient(t).List(TestContext, pods,
ctrl.InNamespace(ns),
ctrl.MatchingLabels{"camel-k": "maven-test-nexus"},
)).To(Succeed())
- Expect(pods.Items).To(HaveLen(1))
+ g.Expect(pods.Items).To(HaveLen(1))
// Retrieve the Nexus admin password
req := TestClient(t).CoreV1().RESTClient().Post().
@@ -360,10 +360,10 @@ ProxyPreserveHost On
}, scheme.ParameterCodec)
exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
var password bytes.Buffer
- Expect(exec.Stream(remotecommand.StreamOptions{
+ g.Expect(exec.Stream(remotecommand.StreamOptions{
Stdout: bufio.NewWriter(&password),
Stderr: os.Stderr,
Tty: false,
@@ -411,9 +411,9 @@ ProxyPreserveHost On
}, scheme.ParameterCodec)
exec, err = remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
- Expect(exec.Stream(remotecommand.StreamOptions{
+ g.Expect(exec.Stream(remotecommand.StreamOptions{
Stdout: os.Stdout,
Stderr: os.Stderr,
Tty: false,
@@ -421,7 +421,7 @@ ProxyPreserveHost On
// Install Camel K with the Maven Central Nexus proxy and the corresponding Maven CA secret
operatorID := "camel-k-maven-ca-secret"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--maven-repository", fmt.Sprintf(`https://%s/repository/maven-public/@id=central-internal@mirrorOf=central`, hostname),
"--maven-repository", fmt.Sprintf(`https://%s/repository/%s/%s`, hostname, stagingRepository.ID, strings.Join(getRepositoryAttributes(stagingRepository), "")),
"--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
@@ -429,32 +429,32 @@ ProxyPreserveHost On
"--maven-cli-option", "--batch-mode",
).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
// Assert no dependencies have been downloaded from the Maven central repository
// Note: this should be adapted for the Pod build strategy
pod := OperatorPod(t, ns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
logs := Logs(t, pod.Namespace, pod.Name, corev1.PodLogOptions{})()
- Expect(logs).NotTo(BeEmpty())
- Expect(logs).NotTo(ContainSubstring("Downloaded from central:"))
+ g.Expect(logs).NotTo(BeEmpty())
+ g.Expect(logs).NotTo(ContainSubstring("Downloaded from central:"))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index ea6e20a44..5989848ae 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -33,15 +33,15 @@ import (
)
func TestBasicUninstall(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// should be completely removed on uninstall
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
// Roles only removed in non-olm use-case
uninstallViaOLM := false
@@ -52,105 +52,105 @@ func TestBasicUninstall(t *testing.T) {
}
if !uninstallViaOLM {
- Eventually(Role(t, ns)).Should(BeNil())
- Eventually(RoleBinding(t, ns)).Should(BeNil())
- Eventually(ServiceAccount(t, ns, "camel-k-operator")).Should(BeNil())
+ g.Eventually(Role(t, ns)).Should(BeNil())
+ g.Eventually(RoleBinding(t, ns)).Should(BeNil())
+ g.Eventually(ServiceAccount(t, ns, "camel-k-operator")).Should(BeNil())
} else {
- Eventually(Role(t, ns)).ShouldNot(BeNil())
- Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Role(t, ns)).ShouldNot(BeNil())
+ g.Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
}
- Eventually(Configmap(t, ns, "camel-k-maven-settings")).Should(BeNil())
- Eventually(OperatorPod(t, ns), TestTimeoutMedium).Should(BeNil())
- Eventually(KameletList(t, ns), TestTimeoutMedium).Should(BeEmpty())
- Eventually(CamelCatalogList(t, ns), TestTimeoutMedium).Should(BeEmpty())
+ g.Eventually(Configmap(t, ns, "camel-k-maven-settings")).Should(BeNil())
+ g.Eventually(OperatorPod(t, ns), TestTimeoutMedium).Should(BeNil())
+ g.Eventually(KameletList(t, ns), TestTimeoutMedium).Should(BeEmpty())
+ g.Eventually(CamelCatalogList(t, ns), TestTimeoutMedium).Should(BeEmpty())
})
}
func TestUninstallSkipOperator(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except operator
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipRole(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except roles
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
- Eventually(Role(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
+ g.Eventually(Role(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipRoleBinding(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except role-bindings
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
- Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
+ g.Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipServiceAccounts(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
- Eventually(ServiceAccount(t, ns, "camel-k-operator")).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
+ g.Eventually(ServiceAccount(t, ns, "camel-k-operator")).ShouldNot(BeNil())
})
}
func TestUninstallSkipIntegrationPlatform(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
// NOTE: skip CRDs is also required in addition to skip integration platform
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipKamelets(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except kamelets
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
- Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
+ g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
})
}
func TestUninstallSkipCamelCatalogs(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except camel catalogs
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
- Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
+ g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
})
}
diff --git a/e2e/install/helm/setup_test.go b/e2e/install/helm/setup_test.go
index 05c6f89ef..471afac44 100644
--- a/e2e/install/helm/setup_test.go
+++ b/e2e/install/helm/setup_test.go
@@ -37,17 +37,15 @@ import (
)
func TestHelmInstallRunUninstall(t *testing.T) {
- RegisterTestingT(t)
-
KAMEL_INSTALL_REGISTRY := os.Getenv("KAMEL_INSTALL_REGISTRY")
customImage := fmt.Sprintf("%s/apache/camel-k", KAMEL_INSTALL_REGISTRY)
os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../")
- WithNewTestNamespace(t, func(ns string) {
- ExpectExecSucceed(t, Make(t, fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
- ExpectExecSucceed(t, Make(t, "release-helm"))
- ExpectExecSucceed(t,
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ ExpectExecSucceed(t, g, Make(t, fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
+ ExpectExecSucceed(t, g, Make(t, "release-helm"))
+ ExpectExecSucceed(t, g,
exec.Command(
"helm",
"install",
@@ -62,24 +60,24 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
//Test a simple route
t.Run("simple route", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRun(t, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRun(t, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"helm",
"uninstall",
@@ -89,6 +87,6 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(t, ns)).Should(BeNil())
+ g.Eventually(OperatorPod(t, ns)).Should(BeNil())
})
}
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index a2fb78f99..03a23555e 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -41,40 +41,40 @@ func TestOperatorBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
namespaceArg,
"INSTALL_DEFAULT_KAMELETS=false"))
// Refresh the test client to account for the newly installed CRDs
RefreshClient(t)
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
registry := os.Getenv("KIND_REGISTRY")
if registry != "" {
platform := Platform(t, ns)()
- Expect(platform.Status.Build.Registry).ShouldNot(BeNil())
- Expect(platform.Status.Build.Registry.Address).To(Equal(registry))
+ g.Expect(platform.Status.Build.Registry).ShouldNot(BeNil())
+ g.Expect(platform.Status.Build.Registry.Address).To(Equal(registry))
}
})
@@ -85,21 +85,21 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
newImage := "quay.io/kameltest/kamel-operator"
newTag := "1.1.1"
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
fmt.Sprintf("CUSTOM_IMAGE=%s", newImage),
fmt.Sprintf("CUSTOM_VERSION=%s", newTag),
namespaceArg,
@@ -108,7 +108,7 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
// Refresh the test client to account for the newly installed CRDs
RefreshClient(t)
- Eventually(OperatorImage(t, ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
+ g.Eventually(OperatorImage(t, ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
})
}
@@ -117,19 +117,19 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg, "GLOBAL=true"))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg, "GLOBAL=true"))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
namespaceArg,
"GLOBAL=true",
"INSTALL_DEFAULT_KAMELETS=false"))
@@ -138,26 +138,26 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
RefreshClient(t)
podFunc := OperatorPod(t, ns)
- Eventually(podFunc).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(podFunc).ShouldNot(BeNil())
+ g.Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
pod := podFunc()
containers := pod.Spec.Containers
- Expect(containers).NotTo(BeEmpty())
+ g.Expect(containers).NotTo(BeEmpty())
envvars := containers[0].Env
- Expect(envvars).NotTo(BeEmpty())
+ g.Expect(envvars).NotTo(BeEmpty())
found := false
for _, v := range envvars {
if v.Name == "WATCH_NAMESPACE" {
- Expect(v.Value).To(Equal("\"\""))
+ g.Expect(v.Value).To(Equal("\"\""))
found = true
break
}
}
- Expect(found).To(BeTrue())
+ g.Expect(found).To(BeTrue())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index bcde0f9d6..4ec9989ea 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -34,34 +34,34 @@ import (
)
func TestSetupKustomizeBasic(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- Expect(UninstallAll(t)).To(Succeed())
- Eventually(CRDs(t)).Should(HaveLen(0))
+ g.Expect(UninstallAll(t)).To(Succeed())
+ g.Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
... 2088 lines suppressed ...