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

[22.05] Add missing celery dep to galaxy test base #15205

Open
wants to merge 4 commits into
base: release_22.05
Choose a base branch
from
Open

[22.05] Add missing celery dep to galaxy test base #15205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9c5854
Add missing celery dependency to galaxy-test-base
nuwang Dec 13, 2022
ba0af70
Conditionally stop fork_pool
nuwang Dec 13, 2022
6519dfb
Use hasattr when testing for attribute
nuwang Dec 13, 2022
3999ced
Change pytest-celery package name to match pyproject
nuwang Nov 14, 2023
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
5 changes: 3 additions & 2 deletions lib/galaxy_test/base/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ def _request_celery_app(self, celery_session_app, celery_config):
if os.environ.get("GALAXY_TEST_EXTERNAL") is None:
from galaxy.celery import celery_app

celery_app.fork_pool.stop()
celery_app.fork_pool.join(timeout=5)
if hasattr(celery_app, "fork_pool"):
celery_app.fork_pool.stop()
celery_app.fork_pool.join(timeout=5)

@pytest.fixture(autouse=True, scope="session")
def _request_celery_worker(self, celery_session_worker, celery_config, celery_worker_parameters):
Expand Down
1 change: 1 addition & 0 deletions packages/test_base/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ install_requires =
pytest
PyYAML
requests
pytest-celery
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since commit 1fef07c we are not using pytest-celery any more.

packages = find:
python_requires = >=3.7

Expand Down
Loading