Improvements to the hybrid_setup example

docs/userguide/examples/hybrid_setup.rst

@@ -63,8 +63,8 @@ The following diagram lists the relevant files in the project.
         ├── test_hybrid_setup.py
         └── vendors/
             ├── __init__.py
-            ├── memcached.py
             ├── rabbitmq.py
+            ├── redis_backend.py
             └── workers/
                 ├── __init__.py
                 ├── gevent.Dockerfile
@@ -119,8 +119,8 @@ For this example, we have the following test cases.
     in the failover test case. When used without the :func:`celery_setup <pytest_celery.fixtures.setup.celery_setup>`
     fixture, the components will run independently and might not be aware of each other.
 
-rabbitmq.py and memcached.py
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+rabbitmq.py and redis_backend.py
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The brokers and result backend are defined as independent components that are being configured into the setup
 using the ``conftest.py`` file. They add **session scope** fixtures and integrate using the matching :ref:`node class <test-nodes>`.
@@ -135,9 +135,9 @@ Main | Failover Brokers
 Result Backend
 --------------
 
-.. literalinclude:: ../../../examples/hybrid_setup/tests/vendors/memcached.py
+.. literalinclude:: ../../../examples/hybrid_setup/tests/vendors/redis_backend.py
     :language: python
-    :caption: examples.hybrid_setup.tests.vendors.memcached.py
+    :caption: examples.hybrid_setup.tests.vendors.redis_backend.py
 
 gevent.py and gevent.Dockerfile
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

examples/hybrid_setup/requirements.txt

@@ -2,5 +2,5 @@ pytest>=7.4.4
 pytest-xdist>=3.5.0
 pytest-subtests>=0.11.0
 pytest-rerunfailures>=14.0
-celery[gevent]
+celery[gevent]>=5.5.0b3
 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git

examples/hybrid_setup/tests/conftest.py

@@ -7,9 +7,9 @@
 from pytest_celery import CeleryBrokerCluster
 from pytest_celery import CeleryTestWorker
 from pytest_celery import CeleryWorkerCluster
-from pytest_celery import MemcachedTestBackend
-from tests.vendors.memcached import *
+from pytest_celery import RedisTestBackend
 from tests.vendors.rabbitmq import *
+from tests.vendors.redis_backend import *
 from tests.vendors.workers.gevent import *
 from tests.vendors.workers.legacy import *
 
@@ -34,8 +34,8 @@ def celery_broker_cluster(
 
 
 @pytest.fixture
-def celery_backend_cluster(session_memcached_backend: MemcachedTestBackend) -> CeleryBackendCluster:
-    cluster = CeleryBackendCluster(session_memcached_backend)
+def celery_backend_cluster(session_redis_backend: RedisTestBackend) -> CeleryBackendCluster:
+    cluster = CeleryBackendCluster(session_redis_backend)
     yield cluster
     cluster.teardown()
 

examples/hybrid_setup/tests/vendors/redis_backend.py

@@ -0,0 +1,29 @@
+import pytest
+from pytest_docker_tools import container
+from pytest_docker_tools import fetch
+
+from pytest_celery import REDIS_CONTAINER_TIMEOUT
+from pytest_celery import REDIS_ENV
+from pytest_celery import REDIS_IMAGE
+from pytest_celery import REDIS_PORTS
+from pytest_celery import RedisContainer
+from pytest_celery import RedisTestBackend
+
+redis_image = fetch(repository=REDIS_IMAGE)
+redis_test_container = container(
+    # name="Redis-Session-Backend",  # Optional | Incompatible with parallel execution
+    image="{redis_image.id}",
+    scope="session",
+    ports=REDIS_PORTS,
+    environment=REDIS_ENV,
+    network="{hybrid_setup_example_network.name}",
+    wrapper_class=RedisContainer,
+    timeout=REDIS_CONTAINER_TIMEOUT,
+)
+
+
+@pytest.fixture
+def session_redis_backend(redis_test_container: RedisContainer) -> RedisTestBackend:
+    backend = RedisTestBackend(redis_test_container)
+    yield backend
+    backend.teardown()

examples/hybrid_setup/tests/vendors/workers/gevent.Dockerfile

@@ -16,7 +16,7 @@ ENV WORKER_QUEUE=$CELERY_WORKER_QUEUE
 
 # Install packages
 RUN pip install --no-cache-dir --upgrade pip
-RUN pip install "celery[gevent]" "pytest-celery[all]==1.0.0"
+RUN pip install "celery[gevent]>=5.5.0b3" "pytest-celery[all]>=1.0.0"
 
 # The workdir must be /app
 WORKDIR /app

examples/hybrid_setup/tests/vendors/workers/legacy.Dockerfile

@@ -17,7 +17,7 @@ ENV WORKER_QUEUE=$CELERY_WORKER_QUEUE
 
 # Install packages
 RUN pip install --no-cache-dir --upgrade pip \
-    celery==4.4.7 "pytest-celery[all]==1.0.0"
+    celery==4.4.7 "pytest-celery[all]>=1.0.0"
 
 # The workdir must be /app
 WORKDIR /app