Cleanup

celery · Oct 19, 2023 · 2dc8484 · 2dc8484
1 parent 0d29514
commit 2dc8484
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/src/pytest_celery/api/backend.py b/src/pytest_celery/api/backend.py
@@ -18,7 +18,7 @@ def default_config(cls) -> dict:
 
     def restart(self) -> None:
         super().restart()
-        self._app.conf.update(
+        self.app.conf.update(
             result_backend=self.config()["local_url"],
         )
 

diff --git a/src/pytest_celery/api/base.py b/src/pytest_celery/api/base.py
@@ -22,6 +22,10 @@ def __init__(self, container: CeleryTestContainer, app: Celery = None) -> None:
     def container(self) -> CeleryTestContainer:
         return self._container
 
+    @property
+    def app(self) -> Celery:
+        return self._app
+
     def ready(self) -> bool:
         return self.container.ready()
 

diff --git a/src/pytest_celery/api/broker.py b/src/pytest_celery/api/broker.py
@@ -18,7 +18,7 @@ def default_config(cls) -> dict:
 
     def restart(self) -> None:
         super().restart()
-        self._app.conf.update(
+        self.app.conf.update(
             broker_url=self.config()["local_url"],
         )
 

diff --git a/src/pytest_celery/api/worker.py b/src/pytest_celery/api/worker.py
@@ -18,10 +18,6 @@ def __init__(self, container: CeleryTestContainer, app: Celery):
         # Helps with autocomplete in the IDE
         self.container: CeleryWorkerContainer
 
-    @property
-    def app(self) -> Celery:
-        return self._app
-
     @property
     def version(self) -> str:
         if hasattr(self.container, "version"):

diff --git a/tests/integration/api/test_backend.py b/tests/integration/api/test_backend.py
@@ -12,6 +12,9 @@ class test_celey_test_backend:
     def test_ready(self, node: CeleryTestBackend):
         assert node.ready()
 
+    def test_app(self, node: CeleryTestBackend):
+        assert node.app is None
+
 
 @pytest.mark.parametrize("cluster", [lazy_fixture(CELERY_BACKEND_CLUSTER)])
 class test_celery_backend_cluster:

diff --git a/tests/integration/api/test_cluster.py → tests/integration/api/test_base.py b/tests/integration/api/test_cluster.py → tests/integration/api/test_base.py
diff --git a/tests/integration/api/test_broker.py b/tests/integration/api/test_broker.py
@@ -12,6 +12,9 @@ class test_celery_test_broker:
     def test_ready(self, node: CeleryTestBroker):
         assert node.ready()
 
+    def test_app(self, node: CeleryTestBroker):
+        assert node.app is None
+
 
 @pytest.mark.parametrize("cluster", [lazy_fixture(CELERY_BROKER_CLUSTER)])
 class test_celery_broker_cluster:

diff --git a/tests/unit/api/test_base.py b/tests/unit/api/test_base.py
@@ -1,3 +1,5 @@
+from celery import Celery
+
 from pytest_celery import CeleryTestCluster
 from pytest_celery import CeleryTestContainer
 from pytest_celery import CeleryTestNode
@@ -8,6 +10,11 @@ def test_ready(self, unit_tests_container: CeleryTestContainer):
         node = CeleryTestNode(unit_tests_container)
         assert node.ready()
 
+    def test_app(self, unit_tests_container: CeleryTestContainer):
+        expected_app = Celery()
+        node = CeleryTestNode(unit_tests_container, expected_app)
+        assert node.app is expected_app
+
     def test_default_config_format(self, unit_tests_container: CeleryTestContainer):
         node = CeleryTestNode(unit_tests_container)
         assert node.default_config() == dict()

diff --git a/tests/unit/api/test_worker.py b/tests/unit/api/test_worker.py
@@ -10,10 +10,6 @@ def test_ready(self, unit_tests_container: CeleryTestContainer, celery_setup_app
         node = CeleryTestWorker(unit_tests_container, celery_setup_app)
         assert node.ready()
 
-    def test_app(self, unit_tests_container: CeleryTestContainer, celery_setup_app: Celery):
-        node = CeleryTestWorker(unit_tests_container, celery_setup_app)
-        assert node.app is celery_setup_app
-
     def test_default_config_format(
         self,
         unit_tests_container: CeleryTestContainer,