Repository navigation
test: fix pytest-xdist and pytest-timeout working together #1596
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
05325fe
tests: fix pytest-xdist and pytest-timeout working together
ZohebShaikh 0e91d67
increase timeout
ZohebShaikh fe3aa18
rearrange things
ZohebShaikh 4e9bdc8
add docs
ZohebShaikh 3ca1ba7
keep timeout high
ZohebShaikh 7dfd956
Merge remote-tracking branch 'origin/main' into pytest--fix-timeout
ZohebShaikh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -107,8 +107,11 @@ 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 | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I had a look at ophyd-async they are keeping timeout at 60 seconds |
||
|
|
||
| # 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" | ||
|
|
@@ -162,6 +165,9 @@ 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", | ||
| "tests/unit_tests", | ||
| "--cov=blueapi", | ||
| "--cov-report", | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.