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
/
parametrizers.py
diff --git
a/ice_validator/tests/parametrizers.py
b/ice_validator/tests/parametrizers.py
index
35cf6e0
..
763296c
100644
(file)
--- a/
ice_validator/tests/parametrizers.py
+++ b/
ice_validator/tests/parametrizers.py
@@
-58,7
+58,7
@@
def get_template_dir(metafunc):
or, during --self-test, the directory whos name matches
the current tests module name
"""
or, during --self-test, the directory whos name matches
the current tests module name
"""
- if metafunc.config.getoption("template_dir") is None:
+ if metafunc.config.getoption("template_dir"
, None
) is None:
return path.join(
path.dirname(metafunc.module.__file__),
"fixtures",
return path.join(
path.dirname(metafunc.module.__file__),
"fixtures",
@@
-155,7
+155,7
@@
def get_filenames_lists(
"""
extensions = [".yaml", ".yml", ".env"] if extensions is None else extensions
filenames_lists = []
"""
extensions = [".yaml", ".yml", ".env"] if extensions is None else extensions
filenames_lists = []
- if metafunc.config.getoption("self_test"):
+ if metafunc.config.getoption("self_test"
, None
):
filenames_lists.append(
list_template_dir(
metafunc, extensions, exclude_nested, template_type, ["pass"]
filenames_lists.append(
list_template_dir(
metafunc, extensions, exclude_nested, template_type, ["pass"]