arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make determination of app under test more robust

Browse Source
This commit is contained in:
Aurelien Lourot
2020-10-09 11:44:03 +02:00
parent 181bb98d20
commit f27ee7c1f6
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zaza/openstack/charm_tests/test_utils.py
View File

@@ -127,10 +127,28 @@ class BaseCharmTest(unittest.TestCase):
else:
cls.model_name = model.get_juju_model()
cls.test_config = lifecycle_utils.get_charm_config(fatal=False)
charm_under_test_name = cls.test_config['charm_name']
if application_name:
cls.application_name = application_name
else:
cls.application_name = cls.test_config['charm_name']
deployed_app_names = model.sync_deployed(model_name=cls.model_name)
if charm_under_test_name in deployed_app_names:
# There is an application named like the charm under test.
# Let's consider it the application under test:
cls.application_name = charm_under_test_name
else:
# Let's search for any application whose name starts with the
# name of the charm under test and assume it's the application
# under test:
for app_name in deployed_app_names:
if app_name.startswith(charm_under_test_name):
cls.application_name = app_name
break
else:
logging.warning('Could not find application under test')
return
cls.lead_unit = model.get_lead_unit_name(
cls.application_name,
model_name=cls.model_name)