summaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 5f54c369..56047929 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -226,6 +226,14 @@ def pytest_addoption(parser):
226 default=24.0, 226 default=24.0,
227 help="Max rootfs age in hours before warning (default: 24)", 227 help="Max rootfs age in hours before warning (default: 24)",
228 ) 228 )
229 # K3s options
230 parser.addoption(
231 "--k3s-timeout",
232 action="store",
233 type=int,
234 default=300,
235 help="Timeout in seconds for k3s readiness (default: 300)",
236 )
229 # Container registry options 237 # Container registry options
230 parser.addoption( 238 parser.addoption(
231 "--registry-url", 239 "--registry-url",
@@ -589,6 +597,12 @@ def pytest_configure(config):
589 config.addinivalue_line( 597 config.addinivalue_line(
590 "markers", "boot: marks tests that boot a QEMU image (requires built image)" 598 "markers", "boot: marks tests that boot a QEMU image (requires built image)"
591 ) 599 )
600 config.addinivalue_line(
601 "markers", "k3s: marks k3s runtime tests"
602 )
603 config.addinivalue_line(
604 "markers", "multinode: marks multi-node tests (requires two QEMU VMs)"
605 )
592 606
593 607
594@pytest.fixture 608@pytest.fixture