refactor: update edx-notes OAuth2 client creation logic for improved test environment handling

Author: alenkadev

conftest.py

@@ -11,7 +11,6 @@
 # avoid duplicating the implementation
 
 from cms.conftest import _django_clear_site_cache, pytest_configure  # pylint: disable=unused-import
-from oauth2_provider.models import Application
 
 
 # When using self.assertEquals, diffs are truncated. We don't want that, always
@@ -20,13 +19,19 @@
 
 
 @pytest.fixture(autouse=True)
-def create_edxnotes_oauth_client(db):
-	"""
-	Automatically create the edx-notes OAuth2 Application for tests when
-	ENABLE_EDXNOTES is enabled.
-	"""
-	if settings.FEATURES.get('ENABLE_EDXNOTES', False):
-		from openedx.core.djangoapps.oauth_dispatch.tests.factories import ApplicationFactory
-
-		if not Application.objects.filter(name=settings.EDXNOTES_CLIENT_NAME).exists():
-			ApplicationFactory(name=settings.EDXNOTES_CLIENT_NAME)
+def create_edxnotes_oauth_client(django_db_blocker):
+    """
+    Create the edx-notes OAuth2 Application only when notes settings are
+    available and enabled for the current test environment.
+    """
+    features = getattr(settings, 'FEATURES', {})
+    client_name = getattr(settings, 'EDXNOTES_CLIENT_NAME', None)
+    if not features.get('ENABLE_EDXNOTES', False) or not client_name:
+        return
+
+    with django_db_blocker.unblock():
+        from oauth2_provider.models import Application
+        from openedx.core.djangoapps.oauth_dispatch.tests.factories import ApplicationFactory
+
+        if not Application.objects.filter(name=client_name).exists():
+            ApplicationFactory(name=client_name)