From 4172efd8c628bccc9e400744329b9fd801d1ca2f Mon Sep 17 00:00:00 2001 From: David Ames Date: Fri, 16 Aug 2019 11:25:29 -0700 Subject: [PATCH] Explicitly set KSM application name After a change to the way application name is set and because keystone-saml-mellon uses BaseKeystoneTest which sets the application name to "keystone" which breaks KSM actions. This change explicitly sets application name to keystone-saml-mellon. --- zaza/openstack/charm_tests/saml_mellon/tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zaza/openstack/charm_tests/saml_mellon/tests.py b/zaza/openstack/charm_tests/saml_mellon/tests.py index 79a36f9..28ceb4e 100644 --- a/zaza/openstack/charm_tests/saml_mellon/tests.py +++ b/zaza/openstack/charm_tests/saml_mellon/tests.py @@ -20,6 +20,7 @@ import requests import zaza.model from zaza.openstack.charm_tests.keystone import BaseKeystoneTest +import zaza.charm_lifecycle.utils as lifecycle_utils class FailedToReachIDP(Exception): @@ -35,6 +36,11 @@ class CharmKeystoneSAMLMellonTest(BaseKeystoneTest): def setUpClass(cls): """Run class setup for running Keystone SAML Mellon charm tests.""" super(CharmKeystoneSAMLMellonTest, cls).setUpClass() + # Note: The BaseKeystoneTest class sets the application_name to + # "keystone" which breaks keystone-saml-mellon actions. Explicitly set + # application name here. + cls.test_config = lifecycle_utils.get_charm_config() + cls.application_name = cls.test_config['charm_name'] cls.action = "get-sp-metadata" def test_run_get_sp_metadata_action(self):