Further work to get keystone specific test to work

exsdev0 · Sep 25, 2019 · b1e6beb · b1e6beb
1 parent ae6b1d7
commit b1e6beb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/zaza/openstack/charm_tests/keystone/__init__.py b/zaza/openstack/charm_tests/keystone/__init__.py
@@ -30,7 +30,7 @@ class BaseKeystoneTest(test_utils.OpenStackBaseTest):
     """Base for Keystone charm tests."""
 
     @classmethod
-    def setUpClass(cls):
+    def setUpClass(cls, application_name=None):
         """Run class setup for running Keystone charm operation tests."""
         super(BaseKeystoneTest, cls).setUpClass(application_name='keystone')
         # Check if we are related to Vault TLS certificates

diff --git a/zaza/openstack/charm_tests/policyd/tests.py b/zaza/openstack/charm_tests/policyd/tests.py
@@ -92,7 +92,7 @@ def _set_policy_with(self, rules):
         zaza_model.block_until_wl_status_info_starts_with(
             self.application_name, "PO:", negate_match=True)
 
-    def test_policyd_good_yaml(self):
+    def test_001_policyd_good_yaml(self):
         # Test that the policyd with a good zipped yaml file puts the yaml file
         # in the right directory
         good = {
@@ -151,7 +151,9 @@ def setUpClass(cls, application_name=None):
         super(KeystonePolicydTest, cls).setUpClass(application_name)
 
     def test_disable_service(self):
-        self._set_policy_with({"identity:get_auth_domains": "!"})
+        logging.info("Doing policyd override to disable listing domains")
+        self._set_policy_with(
+            {'rule.yaml': "{'identity:get_auth_domains': '!'}"})
         with self.config_change(
                 {'preferred-api-version': self.default_api_version},
                 {'preferred-api-version': '3'},