diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py index 6c816524f..85bcb6245 100644 --- a/e2e/tests/k8s_api.py +++ b/e2e/tests/k8s_api.py @@ -168,9 +168,6 @@ class K8s: def count_secrets_with_label(self, labels, namespace='default'): return len(self.api.core_v1.list_namespaced_secret(namespace, label_selector=labels).items) - def count_secrets_in_namespace(self, labels, namespace): - return len(self.api.core_v1.list_namespaced_secret(namespace).items) - def count_statefulsets_with_label(self, labels, namespace='default'): return len(self.api.apps_v1.list_namespaced_stateful_set(namespace, label_selector=labels).items) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index bd3566d5f..342e62838 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -322,7 +322,6 @@ class EndToEndTestCase(unittest.TestCase): self.eventuallyEqual(lambda: self.k8s.count_running_pods("connection-pooler=acid-minimal-cluster-pooler"), 0, "Pooler pods not scaled down") - @timeout_decorator.timeout(TEST_TIMEOUT_SEC) def test_enable_disable_connection_pooler(self): ''' @@ -611,7 +610,7 @@ class EndToEndTestCase(unittest.TestCase): } } }) - self.eventuallyEqual(lambda: k8s.count_secrets_in_namespace(app_namespace), + self.eventuallyEqual(lambda: k8s.count_secrets_with_label("cluster_name=acid-minimal-cluster,application=spilo", app_namespace), 1, "Secret not created for user in namespace", app_namespace) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)