Turn a few verb-only pytest fixtures into standard functions

pulpcore/tests/functional/__init__.py

@@ -1060,7 +1060,6 @@ def _add_to_filesystem_cleanup(path):
                 pass
 
 
-@pytest.fixture(scope="session")
 def download_content_unit(bindings_cfg, pulp_domain_enabled):
     def _download_content_unit(base_path, content_path, domain="default"):
         async def _get_response(url):
@@ -1089,36 +1088,27 @@ async def _get_response(url):
     return _download_content_unit
 
 
-@pytest.fixture(scope="session")
-def http_get():
-    def _http_get(url, **kwargs):
-        async def _send_request():
-            async with aiohttp.ClientSession(raise_for_status=True) as session:
-                async with session.get(url, **kwargs) as response:
-                    return await response.content.read()
-
-        response = asyncio.run(_send_request())
-        return response
-
-    return _http_get
+def http_get(url, **kwargs):
+    async def _send_request():
+        async with aiohttp.ClientSession(raise_for_status=True) as session:
+            async with session.get(url, **kwargs) as response:
+                return await response.content.read()
 
+    return asyncio.run(_send_request())
 
-@pytest.fixture
-def wget_recursive_download_on_host():
-    def _wget_recursive_download_on_host(url, destination):
-        subprocess.check_output(
-            [
-                "wget",
-                "--recursive",
-                "--no-parent",
-                "--no-host-directories",
-                "--directory-prefix",
-                destination,
-                url,
-            ]
-        )
 
-    return _wget_recursive_download_on_host
+def wget_recursive_download_on_host(url, destination):
+    return subprocess.check_output(
+        [
+            "wget",
+            "--recursive",
+            "--no-parent",
+            "--no-host-directories",
+            "--directory-prefix",
+            destination,
+            url,
+        ]
+    )
 
 
 @pytest.fixture()

pulpcore/tests/functional/api/using_plugin/test_content_directory.py

@@ -1,8 +1,10 @@
 import pytest
 
+from pulpcore.tests.functional.utils import http_get
+
 
 @pytest.mark.parallel
-def test_hidden_distros(file_distribution_factory, pulp_content_url, http_get):
+def test_hidden_distros(file_distribution_factory, pulp_content_url):
     visible = [file_distribution_factory() for _ in range(5)]
     hidden = [file_distribution_factory(hidden=True) for _ in range(5)]
 

pulpcore/tests/functional/api/using_plugin/test_content_path.py

@@ -5,7 +5,7 @@
 from urllib.parse import urljoin
 
 
-from pulpcore.tests.functional.utils import get_from_url
+from pulpcore.tests.functional.utils import get_from_url, http_get
 
 
 @pytest.mark.parallel
@@ -14,7 +14,6 @@ def test_content_directory_listing(
     gen_object_with_cleanup,
     rbac_contentguard_api_client,
     pulp_settings,
-    http_get,
     pulp_status,
 ):
     """Checks that distributions are grouped by base-path when listing content directories."""