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

fix bug in e2e tests

This commit is contained in:
Sergey Dudoladov 2020-04-08 10:24:29 +02:00
parent 19043a4072
commit aa12d6cf04
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/tests/test_e2e.py
View File

@ -205,9 +205,9 @@ class EndToEndTestCase(unittest.TestCase):
"Expected ClusterIP service type for replica, found {}".format(repl_svc_type)) "Expected ClusterIP service type for replica, found {}".format(repl_svc_type))
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_lazy_spilo_update(self): def test_lazy_spilo_upgrade(self):
''' '''
Test lazy update for the Spilo image: operator changes a stateful set but lets pods run with the old image Test lazy upgrade for the Spilo image: operator changes a stateful set but lets pods run with the old image
until they are recreated for reasons other than operator's activity. That works because the operator uses until they are recreated for reasons other than operator's activity. That works because the operator uses
"onDelete" pod update policy for stateful sets. "onDelete" pod update policy for stateful sets.
@ -232,12 +232,12 @@ class EndToEndTestCase(unittest.TestCase):
# restart the pod to get a container with the new image # restart the pod to get a container with the new image
k8s.api.core_v1.delete_namespaced_pod(pod0, "default") k8s.api.core_v1.delete_namespaced_pod(pod0, "default")
k8s.wait_for_pod_start('spilo-role=replica') k8s.wait_for_running_pods('version=acid-minimal-cluster', 2)
# sanity check: restarted pod runs the image specified in operator's conf # sanity check: restarted pod runs the image specified in operator's conf
new_image = k8s.get_effective_pod_image(pod0) new_image = k8s.get_effective_pod_image(pod0)
self.assertEqual(conf_image, new_image, self.assertEqual(conf_image, new_image,
"Lazy updated failed: restarted pod runs image {} different from the one in operator conf {}".format(new_image, conf_image)) "Lazy upgrade failed: restarted pod runs image {} different from the one in operator conf {}".format(new_image, conf_image))
# lazy update works if the restarted pod and older pods have different Spilo versions # lazy update works if the restarted pod and older pods have different Spilo versions
# i.e. the update did not immediately affect all pods # i.e. the update did not immediately affect all pods
@ -252,14 +252,15 @@ class EndToEndTestCase(unittest.TestCase):
} }
k8s.update_config(unpatch_lazy_spilo_upgrade) k8s.update_config(unpatch_lazy_spilo_upgrade)
# at this point operator will complete the normal rolling update # at this point operator will complete the normal rolling upgrade
# so we additonally test if disabling the lazy update (forcing the normal rolling update) works # so we additonally test if disabling the lazy upgrade (forcing the normal rolling upgrade) works
# XXX there is no easy way to wait until the end of Sync()
time.sleep(60) time.sleep(60)
image0 = k8s.get_effective_pod_image(pod0) image0 = k8s.get_effective_pod_image(pod0)
image1 = k8s.get_effective_pod_image(pod1) image1 = k8s.get_effective_pod_image(pod1)
self.assertEqual(image0, image1, "Disabling lazy updated failed: pods still have different images {} and {}".format(image0, image1)) self.assertEqual(image0, image1, "Disabling lazy upgrade failed: pods still have different images {} and {}".format(image0, image1))
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_logical_backup_cron_job(self): def test_logical_backup_cron_job(self):