Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove unnecessary check for pytest.skip"
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_non_server_name.py
diff --git
a/ice_validator/tests/test_non_server_name.py
b/ice_validator/tests/test_non_server_name.py
index
7139c9b
..
7a5c11f
100644
(file)
--- a/
ice_validator/tests/test_non_server_name.py
+++ b/
ice_validator/tests/test_non_server_name.py
@@
-42,7
+42,6
@@
resource property name
"""
import os
import collections
"""
import os
import collections
-import pytest
from .structures import Heat
from .structures import HeatProcessor
from .structures import Heat
from .structures import HeatProcessor
@@
-74,12
+73,7
@@
def test_non_server_name(yaml_file):
"""
h = Heat(filepath=yaml_file)
"""
h = Heat(filepath=yaml_file)
- if not h.resources:
- pytest.skip("No resources in this template")
-
non_servers = get_non_servers(h)
non_servers = get_non_servers(h)
- if not non_servers:
- pytest.skip("No non-server resources in this template")
bad = []
for rid, resource in non_servers.items():
bad = []
for rid, resource in non_servers.items():
@@
-151,7
+145,9
@@
def test_non_server_name(yaml_file):
def test_non_server_name_unique(heat_template):
"""Test name has unique value
"""
def test_non_server_name_unique(heat_template):
"""Test name has unique value
"""
- list_nest = nested_files.get_list_of_nested_files(heat_template, os.path.dirname(heat_template))
+ list_nest = nested_files.get_list_of_nested_files(
+ heat_template, os.path.dirname(heat_template)
+ )
list_nest.append(heat_template)
non_servers = {}
for yaml_file in list_nest:
list_nest.append(heat_template)
non_servers = {}
for yaml_file in list_nest: