Make pytest-django fixture fix optional

Author: pedro-psb

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

@@ -3,20 +3,6 @@
 import pytest
 
 
-@pytest.mark.parallel
-def test_debugging(
-    file_bindings,
-    file_content_unit_with_name_factory,
-    file_repo,
-    monitor_task,
-):
-    i = 0
-    content_unit = file_content_unit_with_name_factory(f"{i}.iso")
-    file_bindings.RepositoriesFileApi.modify(
-        file_repo.pulp_href, {"add_content_units": [content_unit.pulp_href]}
-    ).task
-
-
 @pytest.mark.parallel
 def test_repo_version_pagination(
     file_bindings,

pulpcore/tests/functional/test_pubsub.py

@@ -13,19 +13,26 @@
 
 
 @pytest.fixture(autouse=True)
-def django_connection_reset(django_db_blocker):
+def django_connection_reset(request):
     # django_db_blocker is from pytest-django. We don't want it to try to safeguard
     # us from using our functional Pulp instance.
     # https://pytest-django.readthedocs.io/en/latest/database.html#django-db-blocker
-    django_db_blocker.unblock()
+    pytest_django_installed = False
+    try:
+        django_db_blocker = request.getfixturevalue("django_db_blocker")
+        django_db_blocker.unblock()
+        pytest_django_installed = True
+    except pytest.FixtureLookupError:
+        pass
 
     # If we dont' reset the connections we'll get interference between tests,
     # as listen/notify is connection based.
     from django.db import connections
 
     connections.close_all()
     yield
-    django_db_blocker.block()
+    if pytest_django_installed:
+        django_db_blocker.block()
 
 
 def test_postgres_pubsub():
@@ -61,7 +68,7 @@ class PubsubMessage(NamedTuple):
 
 
 @pytest.fixture
-def pubsub_backend(django_db_blocker):
+def pubsub_backend():
     from pulpcore.tasking import pubsub
 
     return pubsub.PostgresPubSub