Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/_system_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
jobs:
run:
runs-on: ubuntu-latest
timeout-minutes: 20

steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ env:
jobs:
run:
runs-on: ${{ inputs.runs-on }}
timeout-minutes: 15

steps:
- name: Checkout
Expand Down
10 changes: 0 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ dev = [
"pytest-cov",
"pytest-asyncio",
"pytest-httpx>=0.35.0",
"pytest-timeout",
"responses",
"ruff",
"semver",
Expand Down Expand Up @@ -106,11 +105,6 @@ filterwarnings = ["error", "ignore::DeprecationWarning"]
# Doctest python code in docs, python code in src docstrings, test functions in tests
testpaths = "docs src tests"
asyncio_mode = "auto"
# Timeout settings for pytest-timeout
timeout = 10
# Timeout using thread method to make pytest-timeout work with pytest-xdist
timeout_method = "thread"
timeout_func_only = true
[tool.coverage.run]
patch = ["subprocess"]
data_file = "/tmp/blueapi.coverage"
Expand Down Expand Up @@ -164,9 +158,6 @@ commands = [
"pytest",
"-n",
"logical",
# Disable worker restarts so pytest-xdist does not rerun a test in another worker after pytest-timeout triggers
"--max-worker-restart",
"0",
{ replace = "posargs", default = [
"tests/unit_tests",
], extend = true },
Expand All @@ -189,7 +180,6 @@ commands = [
"term",
"--cov-report",
"xml:cov.xml",
"--timeout=60",
{ replace = "posargs", default = [
], extend = true },
],
Expand Down
1 change: 0 additions & 1 deletion tests/system_tests/test_blueapi_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,6 @@ def test_run_blocking_requires_auth(

# Kept last: installs packages into the environment, so it must not run
# before (and potentially disturb) the tests above.
@pytest.mark.timeout(600)
@pytest.mark.parametrize(
"repos,expected_location_name,expected_version",
[
Expand Down
1 change: 0 additions & 1 deletion tests/unit_tests/test_example_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ def test_example_config_is_valid(file_name: str):
loader.load()


@pytest.mark.timeout(30)
@pytest.mark.parametrize("file_name", os.listdir(example_helm))
def test_example_helm_is_valid(file_name: str):
path = example_helm / file_name
Expand Down
14 changes: 0 additions & 14 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading