From b46a9890676edc40866db585f88560ab1b96048a Mon Sep 17 00:00:00 2001 From: alz Date: Sun, 26 Nov 2023 22:40:53 +0300 Subject: [PATCH] Fix test_036 --- tests/e2e/kubectl.py | 5 ++++- tests/e2e/test_operator.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/e2e/kubectl.py b/tests/e2e/kubectl.py index 060dbe397..6370db7fe 100644 --- a/tests/e2e/kubectl.py +++ b/tests/e2e/kubectl.py @@ -214,9 +214,12 @@ def get_count(kind, name="", label="", chi="", ns=None, shell=None): if chi != "" and label == "": label = f"-l clickhouse.altinity.com/chi={chi}" + if ns == None: + ns = current().context.test_namespace + if kind == "pv": # pv is not namespaced so need to search namespace in claimRef - out = launch(f'get pv {label} -o yaml | grep "namespace: {current().context.test_namespace}"', ok_to_fail=True, shell=shell) + out = launch(f'get pv {label} -o yaml | grep "namespace: {ns}"', ok_to_fail=True, shell=shell) else: out = launch( f"get {kind} {name} -o=custom-columns=kind:kind,name:.metadata.name {label}", diff --git a/tests/e2e/test_operator.py b/tests/e2e/test_operator.py index 0be2bf036..88d410f3f 100644 --- a/tests/e2e/test_operator.py +++ b/tests/e2e/test_operator.py @@ -3466,7 +3466,6 @@ def check_metrics_monitoring(operator_namespace, operator_pod, expect_pattern, m @TestScenario @Requirements(RQ_SRS_026_ClickHouseOperator_Managing_ReprovisioningVolume("1.0")) @Name("test_036. Check operator volume re-provisioning") -@Tags("NO_PARALLEL") def test_036(self): """Check clickhouse operator recreates volumes and schema if volume is broken.""" create_shell_namespace_clickhouse_template() @@ -3478,6 +3477,7 @@ def test_036(self): manifest = f"manifests/chi/test-036-volume-re-provisioning-1.yaml" chi = yaml_manifest.get_chi_name(util.get_full_path(manifest)) + cluster = "simple" util.require_keeper(keeper_type=self.context.keeper_type) with Given("chi exists"):