From 1009b70a87648fff38c84d805f92e84a76222635 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 29 Jun 2021 12:38:43 +0000 Subject: [PATCH 1/2] Ensure application name is passed in scenario tests When running Trilio tests in a scenario test there is no 'charm_name' so the application name needs to be explicitly set when calling the setup class otherwise some config, such as lead_unit, is missing. --- zaza/openstack/charm_tests/trilio/tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/trilio/tests.py b/zaza/openstack/charm_tests/trilio/tests.py index ad477d8..6ee23f4 100644 --- a/zaza/openstack/charm_tests/trilio/tests.py +++ b/zaza/openstack/charm_tests/trilio/tests.py @@ -329,7 +329,7 @@ class TrilioBaseTest(test_utils.OpenStackBaseTest): @classmethod def setUpClass(cls): """Run class setup for running tests.""" - super().setUpClass() + super().setUpClass(application_name=cls.application_name) cls.cinder_client = openstack_utils.get_cinder_session_client( cls.keystone_session ) @@ -474,15 +474,19 @@ class TrilioDataMoverBaseTest(TrilioBaseTest): class TrilioDataMoverNFSTest(TrilioDataMoverBaseTest, TrilioGhostNFSShareTest): """Tests for Trilio Data Mover charm backed by NFS.""" + application_name = "trilio-data-mover" class TrilioDataMoverS3Test(TrilioDataMoverBaseTest): """Tests for Trilio Data Mover charm backed by S3.""" + application_name = "trilio-data-mover" class TrilioWLMNFSTest(TrilioWLMBaseTest, TrilioGhostNFSShareTest): """Tests for Trilio WLM charm backed by NFS.""" + application_name = "trilio-wlm" class TrilioWLMS3Test(TrilioWLMBaseTest): """Tests for Trilio WLM charm backed by S3.""" + application_name = "trilio-wlm" From ba1914eb8395f265440023c91b6c196e73bba703 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 29 Jun 2021 12:45:11 +0000 Subject: [PATCH 2/2] Fix lint --- zaza/openstack/charm_tests/trilio/tests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zaza/openstack/charm_tests/trilio/tests.py b/zaza/openstack/charm_tests/trilio/tests.py index 6ee23f4..6fb7692 100644 --- a/zaza/openstack/charm_tests/trilio/tests.py +++ b/zaza/openstack/charm_tests/trilio/tests.py @@ -474,19 +474,23 @@ class TrilioDataMoverBaseTest(TrilioBaseTest): class TrilioDataMoverNFSTest(TrilioDataMoverBaseTest, TrilioGhostNFSShareTest): """Tests for Trilio Data Mover charm backed by NFS.""" + application_name = "trilio-data-mover" class TrilioDataMoverS3Test(TrilioDataMoverBaseTest): """Tests for Trilio Data Mover charm backed by S3.""" + application_name = "trilio-data-mover" class TrilioWLMNFSTest(TrilioWLMBaseTest, TrilioGhostNFSShareTest): """Tests for Trilio WLM charm backed by NFS.""" + application_name = "trilio-wlm" class TrilioWLMS3Test(TrilioWLMBaseTest): """Tests for Trilio WLM charm backed by S3.""" + application_name = "trilio-wlm"