public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Loadbalancer test now uses eventualEqual properly.

This commit is contained in:
Jan Mußler 2020-10-19 10:26:41 +02:00
parent cc4bfb0cfb
commit 38e6261d64
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
e2e/tests/test_e2e.py
View File

@ -185,7 +185,11 @@ class EndToEndTestCase(unittest.TestCase):
''' '''
k8s = self.k8s k8s = self.k8s
cluster_label = 'application=spilo,cluster-name=acid-minimal-cluster' cluster_label = 'application=spilo,cluster-name=acid-minimal-cluster,spilo-role={}'
self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label.format("master")),
'ClusterIP',
"Expected ClusterIP type initially, found {}")
try: try:
# enable load balancer services # enable load balancer services
@ -198,13 +202,13 @@ class EndToEndTestCase(unittest.TestCase):
k8s.api.custom_objects_api.patch_namespaced_custom_object( k8s.api.custom_objects_api.patch_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_enable_lbs) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_enable_lbs)
self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label + ',spilo-role=master'), self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label.format("master")),
'LoadBalancer', 'LoadBalancer',
"Expected LoadBalancer service type for master, found {}") "Expected LoadBalancer service type for master, found {}")
repl_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=replica') self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label.format("replica")),
self.assertEqual(repl_svc_type, 'LoadBalancer', 'LoadBalancer',
"Expected LoadBalancer service type for replica, found {}".format(repl_svc_type)) "Expected LoadBalancer service type for master, found {}")
# disable load balancer services again # disable load balancer services again
pg_patch_disable_lbs = { pg_patch_disable_lbs = {
@ -216,13 +220,13 @@ class EndToEndTestCase(unittest.TestCase):
k8s.api.custom_objects_api.patch_namespaced_custom_object( k8s.api.custom_objects_api.patch_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_disable_lbs) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_disable_lbs)
master_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=master') self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label.format("master")),
self.assertEqual(master_svc_type, 'ClusterIP', 'ClusterIP',
"Expected ClusterIP service type for master, found {}".format(master_svc_type)) "Expected LoadBalancer service type for master, found {}")
repl_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=replica') self.eventuallyEqual(lambda: k8s.get_service_type(cluster_label.format("replica")),
self.assertEqual(repl_svc_type, 'ClusterIP', 'ClusterIP',
"Expected ClusterIP service type for replica, found {}".format(repl_svc_type)) "Expected LoadBalancer service type for master, found {}")
except timeout_decorator.TimeoutError: except timeout_decorator.TimeoutError:
print('Operator log: {}'.format(k8s.get_operator_log())) print('Operator log: {}'.format(k8s.get_operator_log()))