[Cosmos] Fix failing unit tests

sdk/cosmos/azure-cosmos/azure/cosmos/_base.py

@@ -491,7 +491,7 @@ def IsItemContainerLink(link):  # pylint: disable=too-many-return-statements
 
 
 def GetItemContainerInfo(self_link, alt_content_path, id_from_response):
-    """Given the self link and alt_content_path from the reponse header and
+    """Given the self link and alt_content_path from the response header and
     result extract the collection name and collection id.
 
     Every response header has an alt-content-path that is the owner's path in

sdk/cosmos/azure-cosmos/test/test_aad.py

@@ -27,9 +27,7 @@
 from io import StringIO
 
 import azure.cosmos.cosmos_client as cosmos_client
-from azure.cosmos import exceptions
-from azure.identity import ClientSecretCredential
-from azure.core import exceptions
+from azure.cosmos import exceptions, PartitionKey
 from azure.core.credentials import AccessToken
 import test_config
 
@@ -114,19 +112,10 @@ class AadTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.client = cosmos_client.CosmosClient(cls.host, cls.masterKey)
-        cls.database = test_config._test_config.create_database_if_not_exist(cls.client)
-        cls.container = test_config._test_config.create_collection_if_not_exist_no_custom_throughput(cls.client)
-
-    def test_wrong_credentials(self):
-        wrong_aad_credentials = ClientSecretCredential(
-            "wrong_tenant_id",
-            "wrong_client_id",
-            "wrong_client_secret")
-
-        try:
-            cosmos_client.CosmosClient(self.host, wrong_aad_credentials)
-        except exceptions.ClientAuthenticationError as e:
-            print("Client successfully failed to authenticate with message: {}".format(e.message))
+        cls.database = cls.client.create_database_if_not_exists(test_config._test_config.TEST_DATABASE_ID)
+        cls.container = cls.database.create_container_if_not_exists(
+            id=test_config._test_config.TEST_COLLECTION_SINGLE_PARTITION_ID,
+            partition_key=PartitionKey(path="/id"))
 
     def test_emulator_aad_credentials(self):
         if self.host != 'https://localhost:8081/':

sdk/cosmos/azure-cosmos/test/test_client_user_agent.py

@@ -38,14 +38,12 @@
 class TestClientUserAgent(unittest.TestCase):
 
     async def test_client_user_agent(self):
-        client_sync = sync_client.CosmosClient(url=_test_config.host, credential=_test_config.masterKey)
-        client_async = async_client.CosmosClient(url=_test_config.host, credential=_test_config.masterKey)
+        async with async_client.CosmosClient(url=_test_config.host, credential=_test_config.masterKey) as client_async:
+            client_sync = sync_client.CosmosClient(url=_test_config.host, credential=_test_config.masterKey)
 
-        self.assertTrue(client_sync.client_connection._user_agent.startswith("azsdk-python-cosmos/"))
-        self.assertTrue(client_async.client_connection._user_agent.startswith("azsdk-python-cosmos-async/"))
-        self.assertTrue(client_async.client_connection._user_agent != client_sync.client_connection._user_agent)
-
-        await client_async.close()
+            self.assertTrue(client_sync.client_connection._user_agent.startswith("azsdk-python-cosmos/"))
+            self.assertTrue(client_async.client_connection._user_agent.startswith("azsdk-python-cosmos-async/"))
+            self.assertTrue(client_async.client_connection._user_agent != client_sync.client_connection._user_agent)
 
 
 if __name__ == "__main__":

sdk/cosmos/azure-cosmos/test/test_config.py

@@ -45,15 +45,15 @@ class _test_config(object):
     connectionPolicy = documents.ConnectionPolicy()
     connectionPolicy.DisableSSLVerification = True
 
-    global_host = '[YOUR_GLOBAL_ENDPOINT_HERE]'
-    write_location_host = '[YOUR_WRITE_ENDPOINT_HERE]'
-    read_location_host = '[YOUR_READ_ENDPOINT_HERE]'
-    read_location2_host = '[YOUR_READ_ENDPOINT2_HERE]'
-    global_masterKey = '[YOUR_KEY_HERE]'
+    global_host = os.getenv('GLOBAL_ACCOUNT_HOST', host)
+    write_location_host = os.getenv('WRITE_LOCATION_HOST', host)
+    read_location_host = os.getenv('READ_LOCATION_HOST', host)
+    read_location2_host = os.getenv('READ_LOCATION_HOST2', host)
+    global_masterKey = os.getenv('GLOBAL_ACCOUNT_KEY', masterKey)
 
-    write_location = '[YOUR_WRITE_LOCATION_HERE]'
-    read_location = '[YOUR_READ_LOCATION_HERE]'
-    read_location2 = '[YOUR_READ_LOCATION2_HERE]'
+    write_location = os.getenv('WRITE_LOCATION', host)
+    read_location = os.getenv('READ_LOCATION', host)
+    read_location2 = os.getenv('READ_LOCATION2', host)
 
     THROUGHPUT_FOR_5_PARTITIONS = 30000
     THROUGHPUT_FOR_1_PARTITION = 400
@@ -84,16 +84,6 @@ def create_database_if_not_exist(cls, client):
         cls.IS_MULTIMASTER_ENABLED = client.get_database_account()._EnableMultipleWritableLocations
         return cls.TEST_DATABASE
 
-    @classmethod
-    def create_database_if_not_exist_with_throughput(cls, client, throughput):
-        # type: (CosmosClient) -> Database
-        if cls.TEST_DATABASE is not None:
-            return cls.TEST_DATABASE
-        cls.try_delete_database(client)
-        cls.TEST_DATABASE = client.create_database(id=cls.TEST_THROUGHPUT_DATABASE_ID, offer_throughput=throughput)
-        cls.IS_MULTIMASTER_ENABLED = client.get_database_account()._EnableMultipleWritableLocations
-        return cls.TEST_DATABASE
-
     @classmethod
     def try_delete_database(cls, client):
         # type: (CosmosClient) -> None
@@ -131,17 +121,6 @@ def create_multi_partition_collection_with_custom_pk_if_not_exist(cls, client):
         cls.remove_all_documents(cls.TEST_COLLECTION_MULTI_PARTITION_WITH_CUSTOM_PK, True)
         return cls.TEST_COLLECTION_MULTI_PARTITION_WITH_CUSTOM_PK
 
-    @classmethod
-    def create_collection_if_not_exist_no_custom_throughput(cls, client):
-        # type: (CosmosClient) -> Container
-        database = cls.create_database_if_not_exist(client)
-        collection_id = cls.TEST_COLLECTION_SINGLE_PARTITION_ID
-
-        document_collection = database.create_container_if_not_exists(
-            id=collection_id,
-            partition_key=PartitionKey(path="/id"))
-        return document_collection
-
     @classmethod
     def create_collection_with_required_throughput(cls, client, throughput, use_custom_partition_key):
         # type: (CosmosClient, int, boolean) -> Container

sdk/cosmos/azure-cosmos/test/test_crud.py

@@ -112,9 +112,7 @@ def setUpClass(cls):
         cls.client = cosmos_client.CosmosClient(cls.host, cls.masterKey, connection_policy=cls.connectionPolicy)
         cls.databaseForTest = cls.configs.create_database_if_not_exist(cls.client)
 
-    def setUp(self):
-        self.client = cosmos_client.CosmosClient(self.host, self.masterKey, "Session",
-                                                 connection_policy=self.connectionPolicy)
+
     def test_database_crud(self):
         # read databases.
         databases = list(self.client.list_databases())
@@ -1907,33 +1905,10 @@ def test_client_request_timeout_when_connection_retry_configuration_specified(se
             cosmos_client.CosmosClient(CRUDTests.host, CRUDTests.masterKey, "Session", connection_policy=connection_policy)
 
     def test_client_connection_retry_configuration(self):
-        total_time_for_two_retries = self.initialize_client_with_connection_urllib_retry_config(2)
-        total_time_for_three_retries = self.initialize_client_with_connection_urllib_retry_config(3)
-        self.assertGreater(total_time_for_three_retries, total_time_for_two_retries)
-
         total_time_for_two_retries = self.initialize_client_with_connection_core_retry_config(2)
         total_time_for_three_retries = self.initialize_client_with_connection_core_retry_config(3)
         self.assertGreater(total_time_for_three_retries, total_time_for_two_retries)
 
-    def initialize_client_with_connection_urllib_retry_config(self, retries):
-        retry_policy = Retry(
-            total=retries,
-            read=retries,
-            connect=retries,
-            backoff_factor=0.3,
-            status_forcelist=(500, 502, 504)
-        )
-        start_time = time.time()
-        try:
-            cosmos_client.CosmosClient(
-                "https://localhost:9999",
-                CRUDTests.masterKey,
-                "Session",
-                connection_retry_policy=retry_policy)
-            self.fail()
-        except AzureError as e:
-            end_time = time.time()
-            return end_time - start_time
 
     def initialize_client_with_connection_core_retry_config(self, retries):
         start_time = time.time()

sdk/cosmos/azure-cosmos/test/test_env.py

@@ -20,9 +20,7 @@
 #SOFTWARE.
 
 import unittest
-import uuid
 import pytest
-import azure.cosmos.documents as documents
 import azure.cosmos.cosmos_client as cosmos_client
 import test_config
 import os