WIP

src/pytest_celery/api/__init__.py

@@ -1,12 +1,12 @@
 # flake8: noqa
 
-from pytest_celery.api.components import CeleryBackendCluster
-from pytest_celery.api.components import CeleryBrokerCluster
-from pytest_celery.api.components import CeleryTestBackend
-from pytest_celery.api.components import CeleryTestBroker
-from pytest_celery.api.components import CeleryTestCluster
-from pytest_celery.api.components import CeleryTestNode
-from pytest_celery.api.components import CeleryTestWorker
-from pytest_celery.api.components import CeleryWorkerCluster
+from pytest_celery.api.backend import CeleryBackendCluster
+from pytest_celery.api.backend import CeleryTestBackend
+from pytest_celery.api.base import CeleryTestCluster
+from pytest_celery.api.base import CeleryTestNode
+from pytest_celery.api.broker import CeleryBrokerCluster
+from pytest_celery.api.broker import CeleryTestBroker
 from pytest_celery.api.container import CeleryTestContainer
 from pytest_celery.api.setup import CeleryTestSetup
+from pytest_celery.api.worker import CeleryTestWorker
+from pytest_celery.api.worker import CeleryWorkerCluster

src/pytest_celery/api/components/backend/cluster.py → src/pytest_celery/api/backend.py

@@ -3,12 +3,20 @@
 from typing import Union
 
 from pytest_celery import defaults
-from pytest_celery.api.components.backend.node import CeleryTestBackend
-from pytest_celery.api.components.cluster.base import CeleryTestCluster
-from pytest_celery.api.components.cluster.node import CeleryTestNode
+from pytest_celery.api.base import CeleryTestCluster
+from pytest_celery.api.base import CeleryTestNode
 from pytest_celery.api.container import CeleryTestContainer
 
 
+class CeleryTestBackend(CeleryTestNode):
+    @classmethod
+    def default_config(cls) -> dict:
+        return {
+            "url": defaults.WORKER_ENV["CELERY_RESULT_BACKEND"],
+            "local_url": defaults.WORKER_ENV["CELERY_RESULT_BACKEND"],
+        }
+
+
 class CeleryBackendCluster(CeleryTestCluster):
     def __init__(self, *backends: Tuple[Union[CeleryTestBackend, CeleryTestContainer]]) -> None:
         super().__init__(*backends)

src/pytest_celery/api/components/cluster/base.py → src/pytest_celery/api/base.py

@@ -5,10 +5,45 @@
 from typing import Type
 from typing import Union
 
-from pytest_celery.api.components.cluster.node import CeleryTestNode
 from pytest_celery.api.container import CeleryTestContainer
 
 
+class CeleryTestNode:
+    def __init__(self, container: CeleryTestContainer):
+        self._container = container
+
+    @property
+    def container(self) -> CeleryTestContainer:
+        return self._container
+
+    def ready(self) -> bool:
+        return self.container.ready()
+
+    def config(self, *args: tuple, **kwargs: dict) -> dict:
+        return self.container.celeryconfig
+
+    @classmethod
+    def default_config(cls) -> dict:
+        return {}
+
+    def __eq__(self, __value: object) -> bool:
+        if isinstance(__value, CeleryTestNode):
+            return self.container == __value.container
+        return False
+
+    def logs(self) -> str:
+        return self.container.logs()
+
+    def name(self) -> str:
+        return self.container.name
+
+    def kill(self) -> None:
+        self.container.kill()
+
+    def teardown(self) -> None:
+        self.container.teardown()
+
+
 class CeleryTestCluster:
     def __init__(self, *nodes: Tuple[Union[CeleryTestNode, CeleryTestContainer]]) -> None:
         if not nodes:
@@ -38,11 +73,11 @@ def __eq__(self, __value: object) -> bool:
 
     @property
     def nodes(self) -> Tuple[CeleryTestNode]:
-        return self._nodes
+        return self.s
 
     @nodes.setter
     def nodes(self, nodes: Tuple[Union[CeleryTestNode, CeleryTestContainer]]) -> None:
-        self._nodes = self._set_nodes(*nodes)  # type: ignore
+        self.s = self._set_nodes(*nodes)  # type: ignore
 
     @abstractmethod
     def _set_nodes(

src/pytest_celery/api/components/broker/cluster.py → src/pytest_celery/api/broker.py

@@ -3,12 +3,20 @@
 from typing import Union
 
 from pytest_celery import defaults
-from pytest_celery.api.components.broker.node import CeleryTestBroker
-from pytest_celery.api.components.cluster.base import CeleryTestCluster
-from pytest_celery.api.components.cluster.node import CeleryTestNode
+from pytest_celery.api.base import CeleryTestCluster
+from pytest_celery.api.base import CeleryTestNode
 from pytest_celery.api.container import CeleryTestContainer
 
 
+class CeleryTestBroker(CeleryTestNode):
+    @classmethod
+    def default_config(cls) -> dict:
+        return {
+            "url": defaults.WORKER_ENV["CELERY_BROKER_URL"],
+            "local_url": defaults.WORKER_ENV["CELERY_BROKER_URL"],
+        }
+
+
 class CeleryBrokerCluster(CeleryTestCluster):
     def __init__(self, *brokers: Tuple[Union[CeleryTestBroker, CeleryTestContainer]]) -> None:
         super().__init__(*brokers)

src/pytest_celery/api/setup.py

@@ -1,10 +1,10 @@
 from celery import Celery
 
 from pytest_celery import defaults
-from pytest_celery.api.components.backend.cluster import CeleryBackendCluster
-from pytest_celery.api.components.broker.cluster import CeleryBrokerCluster
-from pytest_celery.api.components.worker.cluster import CeleryWorkerCluster
-from pytest_celery.api.components.worker.node import CeleryTestWorker
+from pytest_celery.api.backend import CeleryBackendCluster
+from pytest_celery.api.broker import CeleryBrokerCluster
+from pytest_celery.api.worker import CeleryTestWorker
+from pytest_celery.api.worker import CeleryWorkerCluster
 
 
 class CeleryTestSetup:

src/pytest_celery/api/components/worker/node.py → src/pytest_celery/api/worker.py

@@ -1,6 +1,12 @@
+from typing import Set
+from typing import Tuple
+from typing import Type
+from typing import Union
+
 from celery import Celery
 
-from pytest_celery.api.components.cluster.node import CeleryTestNode
+from pytest_celery.api.base import CeleryTestCluster
+from pytest_celery.api.base import CeleryTestNode
 from pytest_celery.api.container import CeleryTestContainer
 from pytest_celery.containers.worker import CeleryWorkerContainer
 
@@ -33,3 +39,19 @@ def worker_name(self) -> str:
     @property
     def worker_queue(self) -> str:
         return self.container.worker_queue()
+
+
+class CeleryWorkerCluster(CeleryTestCluster):
+    def __init__(self, *workers: Tuple[Union[CeleryTestWorker, CeleryTestContainer]]) -> None:
+        super().__init__(*workers)
+
+    def _set_nodes(
+        self,
+        *nodes: Tuple[Union[CeleryTestNode, CeleryTestContainer]],
+        node_cls: Type[CeleryTestNode] = CeleryTestWorker,
+    ) -> Tuple[CeleryTestNode]:
+        return super()._set_nodes(*nodes, node_cls=node_cls)
+
+    @property
+    def versions(self) -> Set[str]:
+        return {worker.version for worker in self}  # type: ignore

src/pytest_celery/components/worker/fixtures.py

@@ -10,7 +10,7 @@
 from pytest_docker_tools import volume
 
 from pytest_celery import defaults
-from pytest_celery.api.components.worker.node import CeleryTestWorker
+from pytest_celery.api.worker import CeleryTestWorker
 from pytest_celery.containers.worker import CeleryWorkerContainer
 
 

src/pytest_celery/defaults.py

@@ -92,7 +92,7 @@
 
 # Default container settings for all worker container fixtures
 WORKER_CELERY_APP_NAME = "celery_test_app"
-WORKER_CELERY_VERSION = "5.3.0b2"
+WORKER_CELERY_VERSION = "5.3"
 WORKER_LOG_LEVEL = "INFO"
 WORKER_NAME = CELERY_SETUP_WORKER
 WORKER_QUEUE = "celery"

src/pytest_celery/fixtures/backend.py

@@ -3,8 +3,8 @@
 import pytest
 
 from pytest_celery import defaults
-from pytest_celery.api.components.backend import CeleryBackendCluster
-from pytest_celery.api.components.backend import CeleryTestBackend
+from pytest_celery.api.backend import CeleryBackendCluster
+from pytest_celery.api.backend import CeleryTestBackend
 
 
 @pytest.fixture(params=defaults.ALL_CELERY_BACKENDS)

src/pytest_celery/fixtures/broker.py

@@ -3,8 +3,8 @@
 import pytest
 
 from pytest_celery import defaults
-from pytest_celery.api.components.broker import CeleryBrokerCluster
-from pytest_celery.api.components.broker import CeleryTestBroker
+from pytest_celery.api.broker import CeleryBrokerCluster
+from pytest_celery.api.broker import CeleryTestBroker
 
 
 @pytest.fixture(params=defaults.ALL_CELERY_BROKERS)

src/pytest_celery/fixtures/setup.py

@@ -3,10 +3,10 @@
 import pytest
 from celery import Celery
 
-from pytest_celery.api.components.backend.cluster import CeleryBackendCluster
-from pytest_celery.api.components.broker.cluster import CeleryBrokerCluster
-from pytest_celery.api.components.worker.cluster import CeleryWorkerCluster
+from pytest_celery.api.backend import CeleryBackendCluster
+from pytest_celery.api.broker import CeleryBrokerCluster
 from pytest_celery.api.setup import CeleryTestSetup
+from pytest_celery.api.worker import CeleryWorkerCluster
 
 
 @pytest.fixture

src/pytest_celery/fixtures/worker.py

@@ -3,8 +3,8 @@
 import pytest
 
 from pytest_celery import defaults
-from pytest_celery.api.components.worker import CeleryTestWorker
-from pytest_celery.api.components.worker import CeleryWorkerCluster
+from pytest_celery.api.worker import CeleryTestWorker
+from pytest_celery.api.worker import CeleryWorkerCluster
 
 
 @pytest.fixture(params=defaults.ALL_CELERY_WORKERS)

tests/conftest.py

@@ -7,7 +7,7 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
-from pytest_celery.api.components.worker.node import CeleryTestWorker
+from pytest_celery.api.worker import CeleryTestWorker
 from pytest_celery.containers.worker import CeleryWorkerContainer
 
 

tests/integration/components/test_worker.py

@@ -3,7 +3,7 @@
 from pytest_lazyfixture import lazy_fixture
 
 from pytest_celery import defaults
-from pytest_celery.api.components.worker.node import CeleryTestWorker
+from pytest_celery.api.worker import CeleryTestWorker
 
 
 @pytest.mark.parametrize("node", [lazy_fixture(defaults.CELERY_SETUP_WORKER)])

tests/integration/setup/custom/conftest.py

@@ -5,8 +5,8 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
-from pytest_celery.api.components.worker.cluster import CeleryWorkerCluster
-from pytest_celery.api.components.worker.node import CeleryTestWorker
+from pytest_celery.api.worker import CeleryTestWorker
+from pytest_celery.api.worker import CeleryWorkerCluster
 from pytest_celery.containers.worker import CeleryWorkerContainer
 from tests.conftest import Celery5WorkerContainer