X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_heat_template_structure.py;h=da2de5e1abf7ee52892207ba1435c48dbcb69b8e;hb=d8ffed96caada0308ac2ee3f4daf90b7aacb5137;hp=a988aeafe988c72fa946166b6fb4420262d2da45;hpb=10535815da964c683e5f91030934652bfb3f53b8;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index a988aea..da2de5e 100644
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -39,9 +39,10 @@
 
 """Test heat template structure
 """
+import pytest
 
 from tests import cached_yaml as yaml
-from .helpers import validates
+from .helpers import validates, is_base_module, load_yaml
 
 VERSION = "1.2.0"
 
@@ -97,19 +98,14 @@ def test_heat_template_structure_contains_parameters(yaml_file):
 
 
 @validates("R-23664")
-def test_heat_template_structure_contains_resources(yaml_file):
+def test_heat_template_structure_contains_resources(heat_template):
     """
     Check that all heat templates have the required sections
     """
-    required_key_values = ["resources"]
-
-    with open(yaml_file) as fh:
-        yml = yaml.load(fh)
-    assert all(
-        [k in yml for k in required_key_values]
-    ), "{} doesn't contain the {} section, but it is required".format(
-        yaml_file, required_key_values[0]
-    )
+    if is_base_module(heat_template):
+        pytest.skip("Not applicable to base modules")
+    template = load_yaml(heat_template)
+    assert "resources" in template, "This template must contain a resources section"
 
 
 @validates("R-11441")