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

another try to fix python loops

This commit is contained in:
Felix Kunde 2020-04-30 13:33:58 +02:00
parent 11ef0cf722
commit 01dfbe6314
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/tests/test_e2e.py
View File

@ -518,8 +518,8 @@ 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_crd_annotations) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_crd_annotations)
k8s.delete_operator_pod() # wait a little before proceeding
time.sleep(60)
annotations = { annotations = {
"deployment-time": "2020-04-30 12:00:00", "deployment-time": "2020-04-30 12:00:00",
"downscaler/downtime_replicas": "0", "downscaler/downtime_replicas": "0",
@ -731,7 +731,7 @@ class K8s:
def check_service_annotations(self, svc_labels, annotations, namespace='default'): def check_service_annotations(self, svc_labels, annotations, namespace='default'):
svcs = self.api.core_v1.list_namespaced_service(namespace, label_selector=svc_labels, limit=1).items svcs = self.api.core_v1.list_namespaced_service(namespace, label_selector=svc_labels, limit=1).items
for svc in svcs: for svc in svcs:
for key, value in annotations.iteritems(): for key, value in annotations.items():
if key not in svc.metadata.annotations or svc.metadata.annotations[key] != value: if key not in svc.metadata.annotations or svc.metadata.annotations[key] != value:
print("Expected key {} not found in annotations {}".format(key, svc.metadata.annotation)) print("Expected key {} not found in annotations {}".format(key, svc.metadata.annotation))
return False return False
@ -740,7 +740,7 @@ class K8s:
def check_statefulset_annotations(self, sset_labels, annotations, namespace='default'): def check_statefulset_annotations(self, sset_labels, annotations, namespace='default'):
ssets = self.api.apps_v1.list_namespaced_stateful_set(namespace, label_selector=sset_labels, limit=1).items ssets = self.api.apps_v1.list_namespaced_stateful_set(namespace, label_selector=sset_labels, limit=1).items
for sset in ssets: for sset in ssets:
for key, value in annotations.iteritems(): for key, value in annotations.items():
if key not in sset.metadata.annotations or sset.metadata.annotations[key] != value: if key not in sset.metadata.annotations or sset.metadata.annotations[key] != value:
print("Expected key {} not found in annotations {}".format(key, sset.metadata.annotation)) print("Expected key {} not found in annotations {}".format(key, sset.metadata.annotation))
return False return False