wip: assert deprecation msg is logged

Author: pedro-psb

pulpcore/pytest_plugin.py

@@ -993,35 +993,57 @@ def _wget_recursive_download_on_host(url, destination):
 # Tasking related fixtures
 
 
+def _build_dispatch_cmd(pulpcore_bindings, task_group_id, args, kwargs):
+    cid = pulpcore_bindings.client.default_headers.get("Correlation-ID") or str(uuid.uuid4())
+    username = pulpcore_bindings.client.configuration.username
+    return (
+        "from django_guid import set_guid; "
+        "from pulpcore.tasking.tasks import dispatch; "
+        "from pulpcore.app.models import TaskGroup; "
+        "from pulpcore.app.util import get_url, set_current_user; "
+        "from django.contrib.auth import get_user_model; "
+        "User = get_user_model(); "
+        f"user = User.objects.filter(username='{username}').first(); "
+        "set_current_user(user); "
+        f"set_guid({cid!r}); "
+        f"tg = {task_group_id!r} and TaskGroup.objects.filter(pk={task_group_id!r}).first(); "
+        f"task = dispatch(*{args!r}, task_group=tg, **{kwargs!r}); "
+        "print(get_url(task))"
+    )
+
+
 @pytest.fixture(scope="session")
 def dispatch_task(pulpcore_bindings):
     def _dispatch_task(*args, task_group_id=None, **kwargs):
-        cid = pulpcore_bindings.client.default_headers.get("Correlation-ID") or str(uuid.uuid4())
-        username = pulpcore_bindings.client.configuration.username
-        commands = (
-            "from django_guid import set_guid; "
-            "from pulpcore.tasking.tasks import dispatch; "
-            "from pulpcore.app.models import TaskGroup; "
-            "from pulpcore.app.util import get_url, set_current_user; "
-            "from django.contrib.auth import get_user_model; "
-            "User = get_user_model(); "
-            f"user = User.objects.filter(username='{username}').first(); "
-            "set_current_user(user); "
-            f"set_guid({cid!r}); "
-            f"tg = {task_group_id!r} and TaskGroup.objects.filter(pk={task_group_id!r}).first(); "
-            f"task = dispatch(*{args!r}, task_group=tg, **{kwargs!r}); "
-            "print(get_url(task))"
-        )
-
+        commands = _build_dispatch_cmd(pulpcore_bindings, task_group_id, args, kwargs)
         process = subprocess.run(["pulpcore-manager", "shell", "-c", commands], capture_output=True)
-
         assert process.returncode == 0
         task_href = process.stdout.decode().strip()
         return task_href
 
     return _dispatch_task
 
 
+@pytest.fixture(scope="session")
+def dispatch_task_with_stderr(pulpcore_bindings):
+    """Variation of dispatch_task that returns (task_href, stderr_content).
+
+    The stderr can be useful write asserts over log messages.
+    This is required because the pytest caplog fixture can't capture log messages
+    streamed from the pulpcore-manager call.
+    """
+
+    def _dispatch_task(*args, task_group_id=None, **kwargs):
+        commands = _build_dispatch_cmd(pulpcore_bindings, task_group_id, args, kwargs)
+        process = subprocess.run(["pulpcore-manager", "shell", "-c", commands], capture_output=True)
+        assert process.returncode == 0
+        task_href = process.stdout.decode().strip()
+        stderr = process.stderr.decode()
+        return task_href, stderr
+
+    return _dispatch_task
+
+
 @pytest.fixture(scope="session")
 def dispatch_task_group(dispatch_task):
     def _dispatch_task_group(task_name, *args, **kwargs):

pulpcore/tests/functional/api/test_tasking.py

@@ -3,7 +3,6 @@
 import json
 import pytest
 import time
-import logging
 
 from aiohttp import BasicAuth
 from datetime import datetime
@@ -475,23 +474,22 @@ def test_succeeds_on_api_worker(self, pulpcore_bindings, dispatch_task):
     def test_executes_on_api_worker_when_no_async(
         self,
         pulpcore_bindings,
-        dispatch_task,
-        caplog,
+        dispatch_task_with_stderr,
     ):
         """
         GIVEN a task with no resource requirements
         AND the task IS NOT an async function
         WHEN dispatching a task as immediate
         THEN the task completes with no associated worker
         """
-        caplog.set_level(logging.WARNING)
         # TODO: on 3.85 this should throw an error
-        task_href = dispatch_task(
+        task_href, stderr = dispatch_task_with_stderr(
             "pulpcore.app.tasks.test.sleep", args=(LT_TIMEOUT,), immediate=True
         )
         task = pulpcore_bindings.TasksApi.read(task_href)
         assert task.state == "completed"
         assert task.worker is None
+        assert "Support for non-coroutine immediate tasks will be dropped" in stderr
 
     @pytest.mark.parallel
     def test_timeouts_on_api_worker(self, pulpcore_bindings, dispatch_task):
@@ -530,7 +528,9 @@ def _dispatch_long_task(required_resources: list[str], duration=5):
         )
         wait_until("running", task_href)
         yield
-        pulpcore_bindings.TasksApi.tasks_cancel(task_href, {"state": "canceled"})
+        task = pulpcore_bindings.TasksApi.read(task_href)
+        if task.state == "running":
+            pulpcore_bindings.TasksApi.tasks_cancel(task_href, {"state": "canceled"})
 
     return _dispatch_long_task
 
@@ -546,16 +546,14 @@ def test_executes_in_task_worker(
         WHEN dispatching a task as immediate
         THEN the task completes with a worker
         """
-        COMMON_RESOURCE = "MMM"
+        COMMON_RESOURCE = str(uuid4())
         with dispatch_long_task(required_resources=[COMMON_RESOURCE]):
             task_href = dispatch_task(
                 "pulpcore.app.tasks.test.asleep",
                 args=(LT_TIMEOUT,),
                 immediate=True,
                 exclusive_resources=[COMMON_RESOURCE],
             )
-            task = pulpcore_bindings.TasksApi.read(task_href)
-            assert task.state == "waiting"
         task = monitor_task(task_href)
         assert task.state == "completed"
         assert task.worker is not None
@@ -569,7 +567,7 @@ def test_throws_when_non_deferrable(
         WHEN dispatching as immediate and not deferrable
         THEN an error is raised
         """
-        COMMON_RESOURCE = "NNN"
+        COMMON_RESOURCE = str(uuid4())
         with dispatch_long_task(required_resources=[COMMON_RESOURCE]):
             task_href = dispatch_task(
                 "pulpcore.app.tasks.test.asleep",
@@ -593,7 +591,7 @@ def test_timeouts_on_task_worker(
         AND it takes longer than timeout
         THEN an error is raised
         """
-        COMMON_RESOURCE = "PPP"
+        COMMON_RESOURCE = str(uuid4())
         with pytest.raises(PulpTaskError) as ctx:
             with dispatch_long_task(required_resources=[COMMON_RESOURCE]):
                 task_href = dispatch_task(
@@ -602,7 +600,5 @@ def test_timeouts_on_task_worker(
                     immediate=True,
                     exclusive_resources=[COMMON_RESOURCE],
                 )
-                task = pulpcore_bindings.TasksApi.read(task_href)
-                assert task.state == "waiting"
             monitor_task(task_href)
         assert "task timed out after" in ctx.value.task.error["description"]