Skip to content

Commit c9ee50e

Browse files
HITL: override addopts to disable xdist for hardware tests (#2370)
1 parent c10b82f commit c9ee50e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pipeline {
114114
["build", "scons"],
115115
["flash", "cd scripts/ && ./reflash_internal_panda.py"],
116116
["flash jungle", "cd board/jungle && ./flash.py --all"],
117-
["test", "cd tests/hitl && pytest --durations=0 2*.py [5-9]*.py"],
117+
["test", "cd tests/hitl && pytest -o 'addopts=' --durations=0 2*.py [5-9]*.py"],
118118
])
119119
}
120120
}
@@ -126,7 +126,7 @@ pipeline {
126126
["build", "scons"],
127127
["flash", "cd scripts/ && ./reflash_internal_panda.py"],
128128
["flash jungle", "cd board/jungle && ./flash.py --all"],
129-
["test", "cd tests/hitl && pytest --durations=0 2*.py [5-9]*.py"],
129+
["test", "cd tests/hitl && pytest -o 'addopts=' --durations=0 2*.py [5-9]*.py"],
130130
])
131131
}
132132
}

tests/hitl/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ def pytest_configure(config):
5353
config.addinivalue_line(
5454
"markers", "panda_expect_can_error: mark test to ignore CAN health errors"
5555
)
56+
config.addinivalue_line(
57+
"markers", "timeout: set test timeout in seconds"
58+
)
5659

5760
@pytest.hookimpl(tryfirst=True)
5861
def pytest_collection_modifyitems(items):

0 commit comments

Comments
 (0)