fixing CI pipeline binding

dibahlfi · dibahlfi · commit ffb4ed3307d7 · 2026-05-06T22:25:26.000-05:00
diff --git a/sdk/cosmos/azure-cosmos/tests/test_aad.py b/sdk/cosmos/azure-cosmos/tests/test_aad.py
@@ -37,7 +37,7 @@ def get_test_item(num):
 
 class CosmosEmulatorCredential(object):
     def get_token(self, *scopes, **kwargs):
-        # type: (*str, **Any) -> AccessToken
+        # type: (*str, **object) -> AccessToken
         """Request an access token for the emulator. Based on Azure Core's Access Token Credential.
 
         This method is called automatically by Azure SDK clients.
@@ -88,7 +88,6 @@ def get_token(self, *scopes, **kwargs):
 
 
 @pytest.mark.cosmosEmulator
-@pytest.mark.cosmosAAD
 @pytest.mark.skipif(
     not test_config.TestConfig.is_emulator
     and test_config.TestConfig.data_auth_mode != 'aad',
diff --git a/sdk/cosmos/azure-cosmos/tests/test_aad_async.py b/sdk/cosmos/azure-cosmos/tests/test_aad_async.py
@@ -37,7 +37,7 @@ def get_test_item(num):
 
 class CosmosEmulatorCredential(object):
     async def get_token(self, *scopes, **kwargs):
-        # type: (*str, **Any) -> AccessToken
+        # type: (*str, **object) -> AccessToken
         """Request an access token for the emulator. Based on Azure Core's Access Token Credential.
 
         This method is called automatically by Azure SDK clients.
@@ -88,7 +88,6 @@ async def get_token(self, *scopes, **kwargs):
 
 
 @pytest.mark.cosmosEmulator
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 class TestAADAsync(unittest.IsolatedAsyncioTestCase):
     client: CosmosClient = None
     database: DatabaseProxy = None
diff --git a/sdk/cosmos/azure-cosmos/tests/test_auto_scale.py b/sdk/cosmos/azure-cosmos/tests/test_auto_scale.py
@@ -12,7 +12,6 @@
 from azure.cosmos import ThroughputProperties, PartitionKey
 
 @pytest.mark.cosmosLong
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 class TestAutoScale(unittest.TestCase):
     client: CosmosClient = None
     key_client: CosmosClient = None
diff --git a/sdk/cosmos/azure-cosmos/tests/test_auto_scale_async.py b/sdk/cosmos/azure-cosmos/tests/test_auto_scale_async.py
@@ -12,7 +12,6 @@
 from azure.cosmos.aio import CosmosClient, DatabaseProxy
 
 @pytest.mark.cosmosLong
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 class TestAutoScaleAsync(unittest.IsolatedAsyncioTestCase):
     host = test_config.TestConfig.host
     masterKey = test_config.TestConfig.masterKey
diff --git a/sdk/cosmos/azure-cosmos/tests/test_change_feed.py b/sdk/cosmos/azure-cosmos/tests/test_change_feed.py
@@ -45,7 +45,7 @@ def round_time():
 
 @pytest.mark.cosmosCircuitBreaker
 @pytest.mark.cosmosQuery
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
+@pytest.mark.cosmosAAD
 @pytest.mark.unittest
 @pytest.mark.usefixtures("setup")
 class TestChangeFeed:
@@ -208,7 +208,7 @@ def create_random_items(container, batch_size):
                     # Create the item in the container
                     container.upsert_item(item)
                 except exceptions.CosmosHttpResponseError as e:
-                    fail(e)
+                    fail(str(e))
 
         # Create first batch of random items
         create_random_items(created_collection, batchSize)
diff --git a/sdk/cosmos/azure-cosmos/tests/test_change_feed_async.py b/sdk/cosmos/azure-cosmos/tests/test_change_feed_async.py
@@ -52,7 +52,7 @@ def round_time():
 
 @pytest.mark.cosmosCircuitBreaker
 @pytest.mark.cosmosQuery
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
+@pytest.mark.cosmosAAD
 @pytest.mark.asyncio
 @pytest.mark.usefixtures("setup")
 class TestChangeFeedAsync:
@@ -239,7 +239,7 @@ async def create_random_items(container, batch_size):
                     await container.upsert_item(item)
                     created_ids.add(item['id'])
                 except exceptions.CosmosHttpResponseError as e:
-                    pytest.fail(e)
+                    pytest.fail(str(e))
             return created_ids
 
         try:
diff --git a/sdk/cosmos/azure-cosmos/tests/test_crud_database.py b/sdk/cosmos/azure-cosmos/tests/test_crud_database.py
@@ -49,7 +49,6 @@ def send(self, *args, **kwargs):
 
 
 @pytest.mark.cosmosLong
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 class TestCRUDDatabaseOperations(unittest.TestCase):
     """Python CRUD Tests.
     """
diff --git a/sdk/cosmos/azure-cosmos/tests/test_crud_database_async.py b/sdk/cosmos/azure-cosmos/tests/test_crud_database_async.py
@@ -48,7 +48,6 @@ async def send(self, *args, **kwargs):
 
 
 @pytest.mark.cosmosLong
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 class TestCRUDDatabaseOperationsAsync(unittest.IsolatedAsyncioTestCase):
     """Python CRUD Tests.
     """
diff --git a/sdk/cosmos/azure-cosmos/tests/test_feed_range.py b/sdk/cosmos/azure-cosmos/tests/test_feed_range.py
@@ -20,16 +20,12 @@ def setup():
             "You must specify your Azure Cosmos account values for "
             "'masterKey' and 'host' at the top of this class to run the "
             "tests.")
-    # Key-auth client is used for control-plane operations in this test class.
+    # Single key-auth client is sufficient for this emulator-focused test class.
     key_client = cosmos_client.CosmosClient(TestFeedRange.host, test_config.TestConfig.masterKey)
     key_db = key_client.get_database_client(TestFeedRange.TEST_DATABASE_ID)
-    # AAD (or key) client for data-plane operations
-    data_client = test_config.TestConfig.create_data_client()
-    created_db = data_client.get_database_client(TestFeedRange.TEST_DATABASE_ID)
     return {
         "key_db": key_db,
-        "created_db": created_db,
-        "created_collection": created_db.get_container_client(TestFeedRange.TEST_CONTAINER_ID)
+        "created_collection": key_db.get_container_client(TestFeedRange.TEST_CONTAINER_ID)
     }
 
 test_subset_ranges = [(Range("", "FF", True, False),
@@ -85,7 +81,6 @@ def setup():
                        False)]
 
 @pytest.mark.cosmosEmulator
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 @pytest.mark.unittest
 @pytest.mark.usefixtures("setup")
 class TestFeedRange:
@@ -104,8 +99,7 @@ def test_partition_key_to_feed_range(self, setup):
             id='container_' + str(uuid.uuid4()),
             partition_key=partition_key.PartitionKey(path="/id")
         )
-        # Data-plane proxy for feed_range operations
-        created_container = setup["created_db"].get_container_client(created_container_ref.id)
+        created_container = setup["key_db"].get_container_client(created_container_ref.id)
         feed_range = created_container.feed_range_from_partition_key("1")
         feed_range_epk = FeedRangeInternalEpk.from_json(feed_range)
         assert feed_range_epk.get_normalized_range() == Range("3C80B1B7310BB39F29CC4EA05BDD461E",
diff --git a/sdk/cosmos/azure-cosmos/tests/test_feed_range_async.py b/sdk/cosmos/azure-cosmos/tests/test_feed_range_async.py
@@ -12,7 +12,6 @@
 from azure.cosmos import PartitionKey
 
 @pytest.mark.cosmosEmulator
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 @pytest.mark.asyncio
 class TestFeedRangeAsync(unittest.IsolatedAsyncioTestCase):
     """Tests to verify methods for operations on feed ranges
@@ -33,17 +32,13 @@ def setUpClass(cls):
                 "tests.")
 
     async def asyncSetUp(self):
-        # Key-auth client is used for control-plane operations in this test class.
+        # Single key-auth client is sufficient for this emulator-focused test class.
         self.client = CosmosClient(self.host, self.masterKey)
         self.database_for_test = self.client.get_database_client(self.TEST_DATABASE_ID)
-        # AAD (or key) client for data-plane operations
-        self.data_client = test_config.TestConfig.create_data_client_async()
-        self.data_database_for_test = self.data_client.get_database_client(self.TEST_DATABASE_ID)
-        self.data_container_for_test = self.data_database_for_test.get_container_client(self.TEST_CONTAINER_ID)
+        self.container_for_test = self.database_for_test.get_container_client(self.TEST_CONTAINER_ID)
 
     async def asyncTearDown(self):
         await self.client.close()
-        await self.data_client.close()
 
 
     async def test_partition_key_to_feed_range_async(self):
@@ -52,8 +47,7 @@ async def test_partition_key_to_feed_range_async(self):
             id='container_' + str(uuid.uuid4()),
             partition_key=PartitionKey(path="/id")
         )
-        # Data-plane proxy for feed_range operations
-        created_container = self.data_database_for_test.get_container_client(created_container_ref.id)
+        created_container = self.database_for_test.get_container_client(created_container_ref.id)
         feed_range = await created_container.feed_range_from_partition_key("1")
         feed_range_epk = FeedRangeInternalEpk.from_json(feed_range)
         assert feed_range_epk.get_normalized_range() == Range("3C80B1B7310BB39F29CC4EA05BDD461E",
@@ -65,8 +59,8 @@ async def test_feed_range_is_subset_from_pk_async(self):
                                                            "FF",
                                                         True,
                                                         False)).to_dict()
-        epk_child_feed_range = await self.data_container_for_test.feed_range_from_partition_key("1")
-        assert await self.data_container_for_test.is_feed_range_subset(epk_parent_feed_range, epk_child_feed_range)
+        epk_child_feed_range = await self.container_for_test.feed_range_from_partition_key("1")
+        assert await self.container_for_test.is_feed_range_subset(epk_parent_feed_range, epk_child_feed_range)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sdk/cosmos/azure-cosmos/tests/test_routing_map.py b/sdk/cosmos/azure-cosmos/tests/test_routing_map.py
@@ -13,7 +13,6 @@
 from azure.cosmos import _base
 
 
-# @pytest.mark.cosmosAAD  # TEMP: disabled to validate AAD pipeline using only test_aad.py
 @pytest.mark.cosmosEmulator
 class TestRoutingMapEndToEnd(unittest.TestCase):
     """Routing Map Functionalities end-to-end Tests.
diff --git a/sdk/cosmos/azure-cosmos/tests/test_semantic_reranker.py b/sdk/cosmos/azure-cosmos/tests/test_semantic_reranker.py
@@ -7,7 +7,6 @@
 import azure.cosmos.cosmos_client as cosmos_client
 import azure.cosmos.exceptions as exceptions
 import pytest
-from azure.identity import DefaultAzureCredential
 
 import test_config
 
@@ -17,6 +16,7 @@
 class TestSemanticReranker(unittest.TestCase):
     """Test to check semantic reranker behavior."""
     client: cosmos_client.CosmosClient = None
+    key_client: cosmos_client.CosmosClient = None
     config = test_config.TestConfig
     host = config.host
     TEST_DATABASE_ID = config.TEST_DATABASE_ID
@@ -25,23 +25,23 @@ class TestSemanticReranker(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if cls.host == '[YOUR_ENDPOINT_HERE]':
+        if cls.host == '[YOUR_ENDPOINT_HERE]' or cls.config.masterKey == '[YOUR_KEY_HERE]':
             raise Exception(
                 "You must specify your Azure Cosmos account values for "
-                "'host' at the top of this class to run the "
+                "'host' and 'masterKey' at the top of this class to run the "
                 "tests.")
 
-        credential = DefaultAzureCredential()
-        cls.client = cosmos_client.CosmosClient(cls.host, credential=credential)
-        cls.test_db = cls.client.create_database_if_not_exists(cls.TEST_DATABASE_ID)
-        cls.test_container = cls.test_db.create_container_if_not_exists(cls.TEST_CONTAINER_ID,
-                                                                        cls.TEST_CONTAINER_PARTITION_KEY)
+        cls.key_client, cls.key_db, cls.client, cls.created_db = test_config.TestConfig.create_test_clients(
+            cls.TEST_DATABASE_ID
+        )
+        cls.key_db.create_container_if_not_exists(cls.TEST_CONTAINER_ID, cls.TEST_CONTAINER_PARTITION_KEY)
+        cls.test_container = cls.created_db.get_container_client(cls.TEST_CONTAINER_ID)
 
     @classmethod
     def tearDownClass(cls):
         try:
-            cls.test_db.delete_container(cls.TEST_CONTAINER_ID)
-            cls.client.delete_database(cls.TEST_DATABASE_ID)
+            cls.key_db.delete_container(cls.TEST_CONTAINER_ID)
+            cls.key_client.delete_database(cls.TEST_DATABASE_ID)
         except exceptions.CosmosHttpResponseError:
             pass
 
diff --git a/sdk/cosmos/azure-cosmos/tests/test_semantic_reranker_async.py b/sdk/cosmos/azure-cosmos/tests/test_semantic_reranker_async.py
diff --git a/sdk/cosmos/azure-cosmos/tests/test_ttl.py b/sdk/cosmos/azure-cosmos/tests/test_ttl.py
diff --git a/sdk/cosmos/live-platform-matrix-aad.json b/sdk/cosmos/live-platform-matrix-aad.json
diff --git a/sdk/cosmos/live-platform-matrix.json b/sdk/cosmos/live-platform-matrix.json
diff --git a/sdk/cosmos/tests-aad.yml b/sdk/cosmos/tests-aad.yml
