Skip to content
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.

Sign up for GitHub

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

Make pytest timeout configurable and with higher defaults #912

Closed
wants to merge 1 commit into from
Closed

Make pytest timeout configurable and with higher defaults #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 plugin-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ DEFAULT_SETTINGS = {
"pulp_settings": None,
"pulp_settings_s3": None,
"pydocstyle": True,
"pytest_timeout": 3600,
"release_email": "pulp-infra@redhat.com",
"release_user": "pulpbot",
"stalebot_days_until_close": 30,
Expand Down
8 changes: 4 additions & 4 deletions templates/github/.github/workflows/scripts/script.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ else
if [[ "$GITHUB_WORKFLOW" =~ "Nightly" ]]
then
{%- for plugin in plugins %}
cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m parallel -n {{ parallel_test_workers }} --nightly"
cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m 'not parallel' --nightly"
cmd_user_prefix bash -c "pytest -v --timeout={{ pytest_timeout }} -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m parallel -n {{ parallel_test_workers }} --nightly"
cmd_user_prefix bash -c "pytest -v --timeout={{ pytest_timeout }} -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m 'not parallel' --nightly"
{%- endfor %}
else
{%- for plugin in plugins %}
cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m parallel -n {{ parallel_test_workers }}"
cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m 'not parallel'"
cmd_user_prefix bash -c "pytest -v --timeout={{ pytest_timeout }} -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m parallel -n {{ parallel_test_workers }}"
cmd_user_prefix bash -c "pytest -v --timeout={{ pytest_timeout }} -r sx --color=yes --suppress-no-test-exit-code --pyargs {{ plugin.name | snake }}.tests.functional -m 'not parallel'"
{%- endfor %}
fi
fi
Expand Down
Loading