Skip to content
Snippets Groups Projects
Commit 13cff635 authored by Rafael Guterres Jeffman's avatar Rafael Guterres Jeffman
Browse files

Add support to define which playbook tests to execute with pytest.

pytest provide the means to skip tests based on patterns, but writing
these patterns for ansible-freeipa might not be feasible.

This PR allows the selection of playbook tests and modules that will
be executed with pytest using the environmentt variables IPA_ENABLED_TESTS
IPA_ENABLED_MODULES, IPA_DISABLED_TESTS or IPA_DISABLED_MODULES.

When using IPA_ENABLED_MODULES, all modules will be disabled, and only
the modules in the enabled list will be tested. If using the test
filter, IPA_ENABLED_TESTS, all tests are disabled, unless they are in
the enabled test lists.

If the IPA_DISABLED_* version is used, tests and modules are enabled by
default, and the list is used to disable the module or specific test.

To disable a test or module in Azure CI, edit the file
`tests/azure/variables` and add the desired tests or modules to the
parameter variables `enabled_modules`, 'enabled_tests`, `disabled_tests`
or `disable_modules`.

Note that, if added to the `master` branch, this will affect the tests
for every pipeline that it is include (including 'nightly'), so it should
be used with care.

It can be used with TEMP commits to enable only the desired tests,
speeding up upstream tests.
parent 4ff5aaa1
No related branches found
No related tags found
No related merge requests found
...@@ -63,6 +63,24 @@ IPA_SERVER_HOST=<ipaserver_host_or_ip> pytest -rs ...@@ -63,6 +63,24 @@ IPA_SERVER_HOST=<ipaserver_host_or_ip> pytest -rs
For a complete list of options check `pytest --help`. For a complete list of options check `pytest --help`.
### Disabling and enabling playbook tests
Sometimes it is useful to enable or disable specific playbook tests. To only run a subset of modules or tests, use the variables IPA_ENABLED_MODULES and IPA ENABLED_TESTS, to define a comma-separated list of modules or tests to be enabled. Any test or module not in the list will not be executed. For example, to run only `sudorule` and `sudocmd` tests:
```
IPA_ENABLE_MODULES="sudorule,sudocmd" IPA_SERVER_HOST=<ipaserver_host_or_ip> pytest
```
If all but a few selected tests are to be executed, use the IPA_DISABLED_MODULES or IPA_DISABLED_TESTS. For example, to run all, but "test_service_certificate" test:
```
IPA_DISABLED_TESTS=test_service_certificate IPA_SERVER_HOST=<ipaserver_host_or_ip> pytest
```
If none of this variables are defined, all tests will be executed.
To configure the tests that will run for your pull request, add a TEMP commit, with the configuration defined in the file `tests/azure/templates/variables.yml`. Set the variables `ipa_enable_modules`, `ipa_enable_tests`, `ipa_disable_modules`, and `ipa_disable_tests`, in the same way as the equivalent environment variables.
### Types of tests ### Types of tests
#### Playbook tests #### Playbook tests
...@@ -119,6 +137,7 @@ molecule destroy -s c8s ...@@ -119,6 +137,7 @@ molecule destroy -s c8s
See [Running the tests](#running-the-tests) section for more information on available options. See [Running the tests](#running-the-tests) section for more information on available options.
## Upcoming/desired improvements: ## Upcoming/desired improvements:
* A script to pre-config the complete test environment using virsh. * A script to pre-config the complete test environment using virsh.
......
...@@ -18,11 +18,12 @@ parameters: ...@@ -18,11 +18,12 @@ parameters:
- name: build_number - name: build_number
type: string type: string
jobs: jobs:
- job: Test_Group${{ parameters.group_number }} - job: Test_Group${{ parameters.group_number }}
displayName: Run playbook tests ${{ parameters.scenario }} (${{ parameters.group_number }}/${{ parameters.number_of_groups }}) displayName: Run playbook tests ${{ parameters.scenario }} (${{ parameters.group_number }}/${{ parameters.number_of_groups }})
timeoutInMinutes: 120 timeoutInMinutes: 120
variables:
- template: variables.yaml
steps: steps:
- task: UsePythonVersion@0 - task: UsePythonVersion@0
inputs: inputs:
...@@ -63,6 +64,10 @@ jobs: ...@@ -63,6 +64,10 @@ jobs:
env: env:
IPA_SERVER_HOST: ${{ parameters.scenario }} IPA_SERVER_HOST: ${{ parameters.scenario }}
RUN_TESTS_IN_DOCKER: true RUN_TESTS_IN_DOCKER: true
IPA_DISABLED_MODULES: ${{ variables.disabled_modules }}
IPA_DISABLED_TESTS: ${{ variables.disabled_tests }}
IPA_ENABLED_MODULES: ${{ variables.enabled_modules }}
IPA_ENABLED_TESTS: ${{ variables.enabled_tests }}
- task: PublishTestResults@2 - task: PublishTestResults@2
inputs: inputs:
......
...@@ -53,6 +53,10 @@ jobs: ...@@ -53,6 +53,10 @@ jobs:
env: env:
IPA_SERVER_HOST: ${{ parameters.scenario }} IPA_SERVER_HOST: ${{ parameters.scenario }}
RUN_TESTS_IN_DOCKER: true RUN_TESTS_IN_DOCKER: true
IPA_DISABLED_MODULES: ${{ variables.disabled_modules }}
IPA_DISABLED_TESTS: ${{ variables.disabled_tests }}
IPA_ENABLED_MODULES: ${{ variables.enabled_modules }}
IPA_ENABLED_TESTS: ${{ variables.enabled_tests }}
- task: PublishTestResults@2 - task: PublishTestResults@2
inputs: inputs:
......
#
# Variables must be defined as comma separated lists.
# For easier management of items to enable/disable,
# use one test/module on each line, followed by a comma.
#
# Example:
#
# disabled_modules: >-
# dnsconfig,
# group,
# hostgroup
#
---
variables:
# ipa_enabled_modules: >-
# ipa_enabled_tests: >-
# ipa_disabled_modules: >-
# ipa_disabled_tests: >-
...@@ -24,11 +24,12 @@ import functools ...@@ -24,11 +24,12 @@ import functools
from unittest import TestCase from unittest import TestCase
from utils import get_test_playbooks, get_server_host, run_playbook from utils import get_test_playbooks, get_skip_conditions, run_playbook
def prepare_test(test_name, test_path): def prepare_test(testname, testpath):
"""Decorator for the tests generated automatically from playbooks. """
Decorate tests generated automatically from playbooks.
Injects 2 arguments to the test (`test_path` and `test_name`) and Injects 2 arguments to the test (`test_path` and `test_name`) and
name the test method using test name (to ensure test reports are useful). name the test method using test name (to ensure test reports are useful).
...@@ -36,13 +37,13 @@ def prepare_test(test_name, test_path): ...@@ -36,13 +37,13 @@ def prepare_test(test_name, test_path):
def decorator(func): def decorator(func):
@functools.wraps(func) @functools.wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
kwargs["test_path"] = test_path kwargs["test_path"] = testpath
kwargs["test_name"] = test_name kwargs["test_name"] = testname
return func(*args, **kwargs) return func(*args, **kwargs)
return wrapper return wrapper
decorator.__name__ = test_name decorator.__name__ = testname
return decorator return decorator
...@@ -50,18 +51,21 @@ def prepare_test(test_name, test_path): ...@@ -50,18 +51,21 @@ def prepare_test(test_name, test_path):
# test_* methods. # test_* methods.
for test_dir_name, playbooks_in_dir in get_test_playbooks().items(): for test_dir_name, playbooks_in_dir in get_test_playbooks().items():
_tests = {} _tests = {}
for playbook in playbooks_in_dir: for playbook in playbooks_in_dir:
test_name = playbook["name"].replace("-", "_") test_name = playbook["name"].replace("-", "_")
test_path = playbook["path"] test_path = playbook["path"]
@pytest.mark.skipif( skip = get_skip_conditions(test_dir_name, test_name) or {}
not get_server_host(),
reason="Environment variable IPA_SERVER_HOST must be set", # pylint: disable=W0621,W0640,W0613
) @pytest.mark.skipif(**skip)
@pytest.mark.playbook @pytest.mark.playbook
@prepare_test(test_name, test_path) @prepare_test(test_name, test_path)
def method(self, test_path, test_name): def method(self, test_path, test_name):
run_playbook(test_path) run_playbook(test_path)
# pylint: enable=W0621,W0640,W0613
_tests[test_name] = method _tests[test_name] = method
globals()[test_dir_name] = type(test_dir_name, tuple([TestCase]), _tests,) globals()[test_dir_name] = type(test_dir_name, tuple([TestCase]), _tests,)
...@@ -45,6 +45,68 @@ def get_server_host(): ...@@ -45,6 +45,68 @@ def get_server_host():
return os.getenv("IPA_SERVER_HOST") return os.getenv("IPA_SERVER_HOST")
def get_disabled_test(group_name, test_name):
disabled_modules = [
disabled.strip()
for disabled in os.environ.get("IPA_DISABLED_MODULES", "").split(",")
]
disabled_tests = [
disabled.strip()
for disabled in os.environ.get("IPA_DISABLED_TESTS", "").split(",")
if disabled.strip()
]
if not any([disabled_modules, disabled_tests]):
return False
return group_name in disabled_modules or test_name in disabled_tests
def get_enabled_test(group_name, test_name):
enabled_modules = [
enabled.strip()
for enabled in os.environ.get("IPA_ENABLED_MODULES", "").split(":")
if enabled.strip()
]
enabled_tests = [
enabled.strip()
for enabled in os.environ.get("IPA_ENABLED_TESTS", "").split(":")
if enabled.strip()
]
if not any([enabled_modules, enabled_tests]):
return True
group_enabled = group_name in enabled_modules
test_enabled = test_name in enabled_tests
return group_enabled or test_enabled
def get_skip_conditions(group_name, test_name):
"""
Check tests that need to be skipped.
The return is a dict containing `condition` and `reason`. For the test
to be skipped, `condition` must be True, if it is `False`, the test is
to be skipped. Although "reason" must be always provided, it can be
`None` if `condition` is True.
"""
if not get_server_host():
return {
"condition": True,
"reason": "Environment variable IPA_SERVER_HOST must be set",
}
if not get_enabled_test(group_name, test_name):
return {"condition": True, "reason": "Test not configured to run"}
if get_disabled_test(group_name, test_name):
return {"condition": True, "reason": "Test configured to not run"}
return {"condition": False, "reason": "Test will run."}
def get_inventory_content(): def get_inventory_content():
"""Create the content of an inventory file for a test run.""" """Create the content of an inventory file for a test run."""
ipa_server_host = get_server_host() ipa_server_host = get_server_host()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment