Merge pull request #8822 from john-dupuy/add-skip-rhv-iso-servicecatalog

[1LP][RFR] Add a skip if the template is not available in customization templates
ManageIQ · May 14, 2019 · fb2a752 · fb2a752
2 parents 67afb4c + 549b942
commit fb2a752
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cfme/tests/services/test_iso_service_catalogs.py b/cfme/tests/services/test_iso_service_catalogs.py
@@ -33,7 +33,12 @@
 @pytest.fixture(scope="module")
 def iso_cust_template(provider, appliance):
     iso_cust_template = provider.data['provisioning']['iso_kickstart']
-    return get_template_from_config(iso_cust_template, create=True, appliance=appliance)
+    try:
+        return get_template_from_config(iso_cust_template, create=True, appliance=appliance)
+    except KeyError:
+        pytest.skip("No such template '{}' available in 'customization_templates'".format(
+            iso_cust_template
+        ))
 
 
 @pytest.fixture(scope="module")