diff --git a/Jenkinsfile b/Jenkinsfile index a064bdc1..6872ed25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,7 @@ pipeline { ["build", "scons"], ["flash", "cd scripts/ && ./reflash_internal_panda.py"], ["flash jungle", "cd board/jungle && ./flash.py --all"], - ["test", "cd tests/hitl && pytest --durations=0 2*.py [5-9]*.py"], + ["test", "cd tests/hitl && pytest -o 'addopts=' --durations=0 2*.py [5-9]*.py"], ]) } } @@ -126,7 +126,7 @@ pipeline { ["build", "scons"], ["flash", "cd scripts/ && ./reflash_internal_panda.py"], ["flash jungle", "cd board/jungle && ./flash.py --all"], - ["test", "cd tests/hitl && pytest --durations=0 2*.py [5-9]*.py"], + ["test", "cd tests/hitl && pytest -o 'addopts=' --durations=0 2*.py [5-9]*.py"], ]) } } diff --git a/tests/hitl/conftest.py b/tests/hitl/conftest.py index a8adab07..d6881b54 100644 --- a/tests/hitl/conftest.py +++ b/tests/hitl/conftest.py @@ -53,6 +53,9 @@ def pytest_configure(config): config.addinivalue_line( "markers", "panda_expect_can_error: mark test to ignore CAN health errors" ) + config.addinivalue_line( + "markers", "timeout: set test timeout in seconds" + ) @pytest.hookimpl(tryfirst=True) def pytest_collection_modifyitems(items):