Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F9345803
D3481.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Subscribers
None
D3481.diff
View Options
diff --git a/conftest.py b/conftest.py
--- a/conftest.py
+++ b/conftest.py
@@ -9,7 +9,7 @@
from typing import Any, Dict
-from swh.scheduler.tests.conftest import swh_app # noqa
+pytest_plugins = ["swh.scheduler.pytest_plugin", "swh.storage.pytest_plugin"]
@pytest.fixture
@@ -54,9 +54,9 @@
os.environ["https_proxy"] = "http://localhost:999"
-@pytest.fixture(scope="session") # type: ignore # expected redefinition
-def celery_includes():
- return [
+@pytest.fixture(scope="session")
+def swh_scheduler_celery_includes(swh_scheduler_celery_includes):
+ return swh_scheduler_celery_includes + [
"swh.loader.package.archive.tasks",
"swh.loader.package.cran.tasks",
"swh.loader.package.debian.tasks",
diff --git a/pytest.ini b/pytest.ini
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,7 @@
[pytest]
+# Drop this when swh.scheduler stops exporting this plugin automatically
+addopts = -p no:pytest_swh_scheduler -p no:pytest_swh_storage
+
norecursedirs = docs
markers =
diff --git a/requirements-test.txt b/requirements-test.txt
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,5 +2,5 @@
pytest-mock
requests_mock
swh-core[testing]
-swh-scheduler[testing]
+swh-scheduler[testing] >= 0.5.0
swh-storage[testing]
diff --git a/swh/loader/package/archive/tests/test_tasks.py b/swh/loader/package/archive/tests/test_tasks.py
--- a/swh/loader/package/archive/tests/test_tasks.py
+++ b/swh/loader/package/archive/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_archive_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_archive_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.archive.loader.ArchiveLoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.archive.tasks.LoadArchive",
kwargs={"url": "some-url", "artifacts": []},
)
diff --git a/swh/loader/package/cran/tests/test_tasks.py b/swh/loader/package/cran/tests/test_tasks.py
--- a/swh/loader/package/cran/tests/test_tasks.py
+++ b/swh/loader/package/cran/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_cran_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_cran_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.cran.loader.CRANLoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.cran.tasks.LoadCRAN",
kwargs={
"url": "some-url",
diff --git a/swh/loader/package/debian/tests/test_tasks.py b/swh/loader/package/debian/tests/test_tasks.py
--- a/swh/loader/package/debian/tests/test_tasks.py
+++ b/swh/loader/package/debian/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_debian_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_debian_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.debian.loader.DebianLoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.debian.tasks.LoadDebian",
kwargs={"url": "some-url", "date": "some-date", "packages": {}},
)
diff --git a/swh/loader/package/deposit/tests/test_tasks.py b/swh/loader/package/deposit/tests/test_tasks.py
--- a/swh/loader/package/deposit/tests/test_tasks.py
+++ b/swh/loader/package/deposit/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_deposit_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_deposit_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.deposit.loader.DepositLoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.deposit.tasks.LoadDeposit",
kwargs={"url": "some-url", "deposit_id": "some-d-id",},
)
diff --git a/swh/loader/package/nixguix/tests/test_tasks.py b/swh/loader/package/nixguix/tests/test_tasks.py
--- a/swh/loader/package/nixguix/tests/test_tasks.py
+++ b/swh/loader/package/nixguix/tests/test_tasks.py
@@ -4,7 +4,9 @@
# See top-level LICENSE file for more information
-def test_nixguix_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_nixguix_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.nixguix.loader.NixGuixLoader.load")
mock_loader.return_value = {"status": "eventful"}
@@ -17,7 +19,7 @@
"revision": "some-revision",
}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.nixguix.tasks.LoadNixguix", kwargs=dict(url="some-url")
)
assert res
diff --git a/swh/loader/package/npm/tests/test_tasks.py b/swh/loader/package/npm/tests/test_tasks.py
--- a/swh/loader/package/npm/tests/test_tasks.py
+++ b/swh/loader/package/npm/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_npm_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_npm_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.npm.loader.NpmLoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.npm.tasks.LoadNpm",
kwargs=dict(url="https://www.npmjs.com/package/some-package"),
)
diff --git a/swh/loader/package/pypi/tests/test_tasks.py b/swh/loader/package/pypi/tests/test_tasks.py
--- a/swh/loader/package/pypi/tests/test_tasks.py
+++ b/swh/loader/package/pypi/tests/test_tasks.py
@@ -4,11 +4,13 @@
# See top-level LICENSE file for more information
-def test_pypi_loader(mocker, swh_app, celery_session_worker, swh_config):
+def test_pypi_loader(
+ mocker, swh_scheduler_celery_app, swh_scheduler_celery_worker, swh_config
+):
mock_loader = mocker.patch("swh.loader.package.pypi.loader.PyPILoader.load")
mock_loader.return_value = {"status": "eventful"}
- res = swh_app.send_task(
+ res = swh_scheduler_celery_app.send_task(
"swh.loader.package.pypi.tasks.LoadPyPI", kwargs=dict(url="some-url")
)
assert res
diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,8 @@
testing
deps =
swh.core[http]
- swh.storage[testing] # otherwise, somehow pytest-postgresql is not seen
+ swh.storage[testing]
+ swh.scheduler[testing] >= 0.5.0
pytest-cov
dev: pdbpp
commands =
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Jul 3, 3:32 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3224046
Attached To
D3481: Clean up the swh.scheduler / swh.storage pytest plugin imports
Event Timeline
Log In to Comment