From 9721fe5d42e7eb99b608940324c417ce62b04f07 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Fri, 17 May 2019 14:08:58 +0100 Subject: [PATCH] Fix restart_on_changed helper (#6) The restart_on_changed helper was moved to use the config_change context manager but the code that checks that the config file is correctly reverted at the end of the test was accidently left within the context. --- zaza/openstack/charm_tests/test_utils.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py index e67699f..376eca0 100644 --- a/zaza/openstack/charm_tests/test_utils.py +++ b/zaza/openstack/charm_tests/test_utils.py @@ -217,13 +217,12 @@ class OpenStackBaseTest(unittest.TestCase): services, model_name=self.model_name) - logging.debug( - 'Waiting for updates to propagate to '.format(config_file)) - model.block_until_oslo_config_entries_match( - self.application_name, - config_file, - default_entry, - model_name=self.model_name) + logging.debug('Waiting for updates to propagate to '.format(config_file)) + model.block_until_oslo_config_entries_match( + self.application_name, + config_file, + default_entry, + model_name=self.model_name) @contextlib.contextmanager def pause_resume(self, services):