From c5a3f832d014b28dd997356416af3ca082434d4c Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Wed, 16 Sep 2020 12:04:42 +0200
Subject: [PATCH] test_utils/config_change: Wait for agent to start executing

Avoid returning prior to the config change has even started.

Fixes: #419
---
 zaza/openstack/charm_tests/test_utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index 9ba6955..e6eca75 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -267,6 +267,9 @@ class BaseCharmTest(unittest.TestCase):
                 self._stringed_value_config(default_config),
                 model_name=self.model_name)
 
+        logging.debug(
+            'Waiting for units to execute config-changed hook')
+        model.wait_for_agent_status(model_name=self.model_name)
         logging.debug(
             'Waiting for units to reach target states')
         model.wait_for_application_states(