From d3974c84a33ec1f98f192a4565f4fdd0542a4f49 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Mon, 6 Apr 2020 16:12:00 +0200 Subject: [PATCH 1/2] Fix iterating over applications --- zaza/openstack/charm_tests/series_upgrade/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zaza/openstack/charm_tests/series_upgrade/tests.py b/zaza/openstack/charm_tests/series_upgrade/tests.py index 239681f..d5a9163 100644 --- a/zaza/openstack/charm_tests/series_upgrade/tests.py +++ b/zaza/openstack/charm_tests/series_upgrade/tests.py @@ -38,7 +38,7 @@ def _filter_easyrsa(app, app_config, model_name=None): return False -def _filter_etcd(app, app_config, model_name=None): +def _filter_etcd(app, app_config, model_name=None):for application, app_details in applications charm_name = upgrade_utils.extract_charm_name_from_url(app_config['charm']) if "etcd" in charm_name: logging.warn("Skipping series upgrade of easyrsa Bug #1850124") @@ -65,7 +65,7 @@ class SeriesUpgradeTest(unittest.TestCase): applications = model.get_status().applications completed_machines = [] - for application, app_details in applications: + for application, app_details in applications.items(): # Skip subordinates if app_details["subordinate-to"]: continue From 33fa6e02dec10762237389faf48a00b112854151 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Mon, 6 Apr 2020 16:13:56 +0200 Subject: [PATCH 2/2] Fix typo --- zaza/openstack/charm_tests/series_upgrade/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/series_upgrade/tests.py b/zaza/openstack/charm_tests/series_upgrade/tests.py index d5a9163..9e72338 100644 --- a/zaza/openstack/charm_tests/series_upgrade/tests.py +++ b/zaza/openstack/charm_tests/series_upgrade/tests.py @@ -38,7 +38,7 @@ def _filter_easyrsa(app, app_config, model_name=None): return False -def _filter_etcd(app, app_config, model_name=None):for application, app_details in applications +def _filter_etcd(app, app_config, model_name=None): charm_name = upgrade_utils.extract_charm_name_from_url(app_config['charm']) if "etcd" in charm_name: logging.warn("Skipping series upgrade of easyrsa Bug #1850124")