Skip to content

Commit

Permalink
serial -> ci_serial
Browse files Browse the repository at this point in the history
  • Loading branch information
bongbui321 committed Jul 27, 2024
1 parent c97df97 commit 1838326
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/selfdrive_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ jobs:
timeout-minutes: 15
run: |
${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
$PYTEST --timeout 60 -m 'not slow and not serial' && \
$PYTEST -n0 --timeout 60 -m 'serial' && \
$PYTEST --timeout 60 -m 'not slow and not ci_serial' && \
$PYTEST -n0 --timeout 60 -m 'ci_serial' && \
./selfdrive/ui/tests/create_test_translations.sh && \
QT_QPA_PLATFORM=offscreen ./selfdrive/ui/tests/test_translations && \
pytest -n0 ./selfdrive/ui/tests/test_translations.py"
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ python_files = "test_*.py"
markers = [
"slow: tests that take awhile to run and can be skipped with -m 'not slow'",
"tici: tests that are only meant to run on the C3/C3X",
"serial: tests that are run serially to avoid concurrent issues with pytest-xdist",
# TODO: remove serially-run tests in CI. Issue tracker: https://github.com/pytest-dev/pytest/issues/3216
"ci_serial: tests that are run serially to avoid concurrent issues with pytest-xdist in CI ubuntu runners",
]
testpaths = [
"common",
Expand Down
2 changes: 1 addition & 1 deletion system/loggerd/tests/test_loggerd.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def test_init_data_values(self):
assert getattr(initData, initData_key) == v
assert logged_params[param_key].decode() == v

@pytest.mark.serial
@pytest.mark.ci_serial
@flaky(max_runs=3)
def test_rotation(self):
os.environ["LOGGERD_TEST"] = "1"
Expand Down

0 comments on commit 1838326

Please sign in to comment.