summaryrefslogtreecommitdiff
path: root/tests/integration_tests/conftest.py
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2020-12-09 15:49:11 -0600
committerGitHub <noreply@github.com>2020-12-09 16:49:11 -0500
commit17ca02e10623b12065532b26de9cefcccee0062c (patch)
tree6e3a42a784a716cea4f63bee7e5ef8e191ecf925 /tests/integration_tests/conftest.py
parent7ec314a96e764c52181e29902a27346b1021b000 (diff)
downloadvyos-cloud-init-17ca02e10623b12065532b26de9cefcccee0062c.tar.gz
vyos-cloud-init-17ca02e10623b12065532b26de9cefcccee0062c.zip
Add integration test for power_state_change module (#717)
Also introduce the `unstable` mark, to allow us to land tests which run inconsistently (such as this one).
Diffstat (limited to 'tests/integration_tests/conftest.py')
-rw-r--r--tests/integration_tests/conftest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
index 160fc085..53ca5fb5 100644
--- a/tests/integration_tests/conftest.py
+++ b/tests/integration_tests/conftest.py
@@ -71,6 +71,8 @@ def pytest_runtest_setup(item):
supported_os_set = set(os_list).intersection(test_marks)
if current_os and supported_os_set and current_os not in supported_os_set:
pytest.skip("Cannot run on OS {}".format(current_os))
+ if 'unstable' in test_marks and not integration_settings.RUN_UNSTABLE:
+ pytest.skip('Test marked unstable. Manually remove mark to run it')
# disable_subp_usage is defined at a higher level, but we don't
@@ -176,7 +178,7 @@ def _collect_logs(instance: IntegrationInstance, node_id: str,
@contextmanager
-def _client(request, fixture_utils, session_cloud):
+def _client(request, fixture_utils, session_cloud: IntegrationCloud):
"""Fixture implementation for the client fixtures.
Launch the dynamic IntegrationClient instance using any provided