diff options
Diffstat (limited to 'ice_validator/tests/test_vm_type_case.py')
-rw-r--r-- | ice_validator/tests/test_vm_type_case.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ice_validator/tests/test_vm_type_case.py b/ice_validator/tests/test_vm_type_case.py index 3ecd8de..6919404 100644 --- a/ice_validator/tests/test_vm_type_case.py +++ b/ice_validator/tests/test_vm_type_case.py @@ -65,8 +65,6 @@ resources: import collections import re -import pytest - from .structures import Heat from .helpers import validates @@ -101,8 +99,6 @@ def test_vm_type_case(yaml_file): """ heat = Heat(filepath=yaml_file) resources = heat.resources - if not resources: - pytest.skip("No resources found") bad = collections.defaultdict(list) for rid, resource in resources.items(): vm_type = heat.get_vm_type(rid, resource=resource) @@ -115,14 +111,10 @@ def test_vm_type_case(yaml_file): param = param[0] if isinstance(param, str) and case_mismatch(vm_type, param): bad[(rid, vm_type)].append((prop, param)) - if bad: - raise AssertionError( - "vm-type/parameter case mis-match %s" - % ( - "; ".join( - "resource: %s vm-type: %s %s" - % (k[0], k[1], ", ".join("%s: %s" % i for i in v)) - for k, v in bad.items() - ) - ) - ) + + msg = 'vm-type/parameter case mis-match %s' \ + % '; '.join('resource: %s vm-type: %s %s' % (k[0], k[1], + ', '.join('%s: %s' % i for i in v)) for (k, v) in + bad.items()) + + assert not bad, msg |