From d77b868411f3ef9505ada8e4521135c781977de8 Mon Sep 17 00:00:00 2001 From: David Ames Date: Fri, 9 Nov 2018 07:48:42 -0800 Subject: [PATCH] Wait for idleness on config changed Intermittent failures in the keystone testing were due to not waiting long enough after a configuration change. In addition to waiting for expected workload status also wait for idleness. --- zaza/charm_tests/test_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zaza/charm_tests/test_utils.py b/zaza/charm_tests/test_utils.py index 1aacbbf..6948d45 100644 --- a/zaza/charm_tests/test_utils.py +++ b/zaza/charm_tests/test_utils.py @@ -110,6 +110,7 @@ class OpenStackBaseTest(unittest.TestCase): model.wait_for_application_states( model_name=self.model_name, states=self.test_config.get('target_deploy_status', {})) + model.block_until_all_units_idle() yield @@ -124,6 +125,7 @@ class OpenStackBaseTest(unittest.TestCase): model.wait_for_application_states( model_name=self.model_name, states=self.test_config.get('target_deploy_status', {})) + model.block_until_all_units_idle() def restart_on_changed(self, config_file, default_config, alternate_config, default_entry, alternate_entry, services):