From 934225a44819304062c4d9ca190f7c33bb119e50 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Thu, 18 Jan 2024 19:19:49 -0500 Subject: [PATCH] replace pytest-timeouts with pytest-timeout (#31053) * one timeout * timeout * higher timeout for now * bump old-commit-hash: d98b33adc8aaf10d0174d59e4065802c70a3413a --- .github/workflows/selfdrive_tests.yaml | 2 +- poetry.lock | 4 ++-- pyproject.toml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 78502d3799..b9e80e9f74 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -181,7 +181,7 @@ jobs: run: | ${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \ export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' && \ - $PYTEST --timeout 30 -m 'not slow' && \ + $PYTEST --timeout 40 -m 'not slow' && \ ./selfdrive/ui/tests/create_test_translations.sh && \ QT_QPA_PLATFORM=offscreen ./selfdrive/ui/tests/test_translations && \ ./selfdrive/ui/tests/test_translations.py" diff --git a/poetry.lock b/poetry.lock index ae2505a88f..6e77fb4ce9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c125c8386ea69bc1813b850855b8457c4109f721aae934a10daaaaa4c1b6d5da -size 431197 +oid sha256:c1038be6788abc2841b03f1a0d267f69b5c4cfdbaa284f4c5c5b337351fc49cd +size 430491 diff --git a/pyproject.toml b/pyproject.toml index b12a21a962..5641a55101 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -145,7 +145,6 @@ pytest-cpp = "*" pytest-subtests = "*" pytest-xdist = "*" pytest-timeout = "*" -pytest-timeouts = "*" pytest-randomly = "*" ruff = "*" sphinx = "*"