test workflow final fixes

Author: Vemarthula-Microsoft

src/ContentProcessor/conftest.py

@@ -12,28 +12,23 @@
 pytest_plugins = ["pytest_mock"]
 
 
-@pytest.fixture(autouse=True, scope="session")
-def mock_azure_services():
+@pytest.fixture(autouse=True, scope="function") 
+def mock_azure_credentials_for_helpers(request):
     """
-    Mock all Azure services and credentials to prevent real authentication
-    and network calls during testing.
+    Mock Azure credentials for azure_helper classes only.
+    Skip this for credential utility tests that need to test the actual logic.
     """
-    with patch("azure.identity.DefaultAzureCredential") as mock_default, \
-         patch("azure.identity.ManagedIdentityCredential") as mock_managed, \
-         patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
+    # Skip mocking for credential utility tests
+    if "test_azure_credential_utils" in str(request.fspath):
+        yield
+        return
+    
+    with patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
          patch("helpers.azure_credential_utils.get_azure_credential_async") as mock_get_cred_async:
 
         # Create mock credential objects
         mock_credential = MagicMock()
-        mock_default.return_value = mock_credential
-        mock_managed.return_value = mock_credential
         mock_get_cred.return_value = mock_credential
         mock_get_cred_async.return_value = mock_credential
 
-        yield {
-            "credential": mock_credential,
-            "default": mock_default,
-            "managed": mock_managed,
-            "get_credential": mock_get_cred,
-            "get_credential_async": mock_get_cred_async
-        }
+        yield mock_credential

src/ContentProcessor/src/tests/azure_helper/test_storage_blob.py

@@ -1,18 +1,22 @@
 import pytest
 from io import BytesIO
-from unittest.mock import MagicMock
-from libs.azure_helper.storage_blob import StorageBlobHelper
+from unittest.mock import MagicMock, patch
+
+# Ensure Azure credentials are mocked before any imports
+with patch("helpers.azure_credential_utils.get_azure_credential") as mock_cred:
+    mock_cred.return_value = MagicMock()
+    from libs.azure_helper.storage_blob import StorageBlobHelper
 
 
 @pytest.fixture
 def mock_blob_service_client(mocker):
-    """Mock BlobServiceClient to prevent any network calls."""
-    return mocker.patch("azure.storage.blob.BlobServiceClient")
+    """Mock BlobServiceClient class for tests."""
+    return mocker.patch("libs.azure_helper.storage_blob.BlobServiceClient")
 
 
 @pytest.fixture
 def storage_blob_helper(mock_blob_service_client):
-    """Create StorageBlobHelper with all Azure services mocked via conftest.py."""
+    """Create StorageBlobHelper with mocked BlobServiceClient."""
     return StorageBlobHelper(
         account_url="https://testaccount.blob.core.windows.net",
         container_name="testcontainer",

src/ContentProcessorAPI/app/tests/libs/test_storage_blob.py

@@ -1,7 +1,12 @@
 import pytest
 from azure.storage.blob import BlobServiceClient, ContainerClient, BlobClient
 from azure.core.exceptions import ResourceNotFoundError
-from app.libs.storage_blob.helper import StorageBlobHelper
+from unittest.mock import MagicMock, patch
+
+# Ensure Azure credentials are mocked before any imports
+with patch("helpers.azure_credential_utils.get_azure_credential") as mock_cred:
+    mock_cred.return_value = MagicMock()
+    from app.libs.storage_blob.helper import StorageBlobHelper
 
 
 @pytest.fixture

src/ContentProcessorAPI/conftest.py

@@ -12,28 +12,23 @@
 pytest_plugins = ["pytest_mock"]
 
 
-@pytest.fixture(autouse=True, scope="session")
-def mock_azure_services():
+@pytest.fixture(autouse=True, scope="function") 
+def mock_azure_credentials_for_helpers(request):
     """
-    Mock all Azure services and credentials to prevent real authentication
-    and network calls during testing.
+    Mock Azure credentials for azure_helper classes only.
+    Skip this for credential utility tests that need to test the actual logic.
     """
-    with patch("azure.identity.DefaultAzureCredential") as mock_default, \
-         patch("azure.identity.ManagedIdentityCredential") as mock_managed, \
-         patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
+    # Skip mocking for credential utility tests
+    if "test_azure_credential_utils" in str(request.fspath):
+        yield
+        return
+    
+    with patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
          patch("helpers.azure_credential_utils.get_azure_credential_async") as mock_get_cred_async:
 
         # Create mock credential objects
         mock_credential = MagicMock()
-        mock_default.return_value = mock_credential
-        mock_managed.return_value = mock_credential
         mock_get_cred.return_value = mock_credential
         mock_get_cred_async.return_value = mock_credential
 
-        yield {
-            "credential": mock_credential,
-            "default": mock_default,
-            "managed": mock_managed,
-            "get_credential": mock_get_cred,
-            "get_credential_async": mock_get_cred_async
-        }
+        yield mock_credential