mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-31 11:54:47 +00:00
Fix all tests entry point
Running test_playbook_runs.py would result of running only the last collected test but showing the name of the other tests instead. To fix that the test_path was moved to an argument set by a method decorator.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import functools
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from subprocess import Popen
|
from subprocess import Popen
|
||||||
@@ -59,11 +60,16 @@ def get_test_groups():
|
|||||||
return groups
|
return groups
|
||||||
|
|
||||||
|
|
||||||
def rename(newname):
|
def prepare_test(test_name, test_path):
|
||||||
def decorator(f):
|
def decorator(func):
|
||||||
f.__name__ = newname
|
@functools.wraps(func)
|
||||||
return f
|
def wrapper(*args, **kwargs):
|
||||||
|
kwargs["test_path"] = test_path
|
||||||
|
return func(*args, **kwargs)
|
||||||
|
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
decorator.__name__ = test_name
|
||||||
return decorator
|
return decorator
|
||||||
|
|
||||||
|
|
||||||
@@ -73,14 +79,15 @@ for group_name, group_tests in get_test_groups().items():
|
|||||||
_tests = {}
|
_tests = {}
|
||||||
for test_config in group_tests:
|
for test_config in group_tests:
|
||||||
test_name = test_config["name"].replace("-", "_")
|
test_name = test_config["name"].replace("-", "_")
|
||||||
|
test_path = test_config["path"]
|
||||||
|
|
||||||
@pytest.mark.skipif(
|
@pytest.mark.skipif(
|
||||||
os.getenv("IPA_SERVER_HOST") is None,
|
os.getenv("IPA_SERVER_HOST") is None,
|
||||||
reason="Environment variable IPA_SERVER_HOST must be set",
|
reason="Environment variable IPA_SERVER_HOST must be set",
|
||||||
)
|
)
|
||||||
@rename(test_name)
|
@prepare_test(test_name, test_path)
|
||||||
def method(self):
|
def method(self, test_path):
|
||||||
result = run_playbook(test_config["path"])
|
result = run_playbook(test_path)
|
||||||
assert result.returncode == 0
|
assert result.returncode == 0
|
||||||
|
|
||||||
_tests[test_name] = method
|
_tests[test_name] = method
|
||||||
|
|||||||
Reference in New Issue
Block a user