Fixed bug in CeleryTestWorker.hostname() (#108)

Author: Nusnus

src/pytest_celery/api/worker.py

@@ -31,6 +31,9 @@ def worker_name(self) -> str:
     def worker_queue(self) -> str:
         return self.container.worker_queue()
 
+    def hostname(self) -> str:
+        return f"{self.worker_name}@{super().hostname()}"
+
 
 class CeleryWorkerCluster(CeleryTestCluster):
     def __init__(self, *workers: tuple[CeleryTestWorker | CeleryTestContainer]) -> None:

tests/integration/api/test_base.py

@@ -24,7 +24,7 @@ def test_name(self, node: CeleryTestNode):
     def test_hostname(self, node: CeleryTestNode):
         hostname = node.hostname()
         assert isinstance(hostname, str)
-        assert len(hostname) == 12
+        assert node.container.id[:12] in hostname
 
     @pytest.mark.parametrize("signal", [None, "SIGKILL"])
     def test_kill(self, node: CeleryTestNode, signal: str | int):

tests/integration/api/test_worker.py

@@ -9,7 +9,6 @@
 from pytest_celery import CeleryTestWorker
 from pytest_celery import CeleryWorkerCluster
 from pytest_celery import CeleryWorkerContainer
-from tests.integration.conftest import IntegrationWorkerContainer
 
 
 @pytest.mark.parametrize("worker", [lazy_fixture(CELERY_WORKER)])
@@ -20,12 +19,18 @@ def test_app(self, worker: CeleryTestWorker, celery_setup_app: Celery):
     def test_version(self, worker: CeleryTestWorker):
         assert worker.version == CeleryWorkerContainer.version()
 
+    def test_hostname(self, worker: CeleryTestWorker):
+        hostname = worker.hostname()
+        assert "@" in hostname
+        assert worker.worker_name in hostname.split("@")[0]
+        assert worker.container.id[:12] in hostname.split("@")[1]
+
     def test_wait_for_log(self, worker: CeleryTestWorker):
-        log = f"{IntegrationWorkerContainer.worker_name()}@{worker.hostname()} v{worker.version}"
+        log = f"{worker.hostname()} v{worker.version}"
         worker.wait_for_log(log, "test_celey_test_worker.test_wait_for_log")
 
     def test_assert_log_exists(self, worker: CeleryTestWorker):
-        log = f"{IntegrationWorkerContainer.worker_name()}@{worker.hostname()} v{worker.version}"
+        log = f"{worker.hostname()} v{worker.version}"
         worker.assert_log_exists(log, "test_celey_test_worker.test_assert_log_exists")
 
 

tests/unit/api/test_base.py

@@ -63,7 +63,7 @@ def test_name(self, node: CeleryTestNode):
         assert node.name()
 
     def test_hostname(self, node: CeleryTestNode):
-        assert node.hostname()
+        assert node.container.id[:12] in node.hostname()
 
     def test_kill(self, node: CeleryTestNode):
         node.kill()