From 7fa93623e91c52bd510e194fe37c35fceb0c4575 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Mon, 9 Nov 2020 07:35:23 +0100 Subject: [PATCH] test WIP changes to e2e tests --- e2e/tests/k8s_api.py | 2 +- e2e/tests/test_e2e.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py index f2abd8e0c..b566308ba 100644 --- a/e2e/tests/k8s_api.py +++ b/e2e/tests/k8s_api.py @@ -433,7 +433,7 @@ class K8sBase: def count_pdbs_with_label(self, labels, namespace='default'): return len(self.api.policy_v1_beta1.list_namespaced_pod_disruption_budget( namespace, label_selector=labels).items) - + def count_running_pods(self, labels='application=spilo,cluster-name=acid-minimal-cluster', namespace='default'): pods = self.api.core_v1.list_namespaced_pod(namespace, label_selector=labels).items return len(list(filter(lambda x: x.status.phase=='Running', pods))) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 6c627df4c..d10f0c353 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -616,7 +616,7 @@ class EndToEndTestCase(unittest.TestCase): print('Operator log: {}'.format(k8s.get_operator_log())) raise finally: - k8s.api.core_v1.delete_namespace("test") + k8s.api.core_v1.delete_namespace(self.namespace) @timeout_decorator.timeout(TEST_TIMEOUT_SEC) def test_zz_node_readiness_label(self): @@ -667,7 +667,7 @@ class EndToEndTestCase(unittest.TestCase): raise @timeout_decorator.timeout(TEST_TIMEOUT_SEC) - def test_scaling(self): + def test_a_scaling(self): ''' Scale up from 2 to 3 and back to 2 pods by updating the Postgres manifest at runtime. '''