Revert "Went trought Suyog comments"

This reverts commit 35c6223.

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
     "git.ignoreLimitWarning": true,
-    "python.testing.pytestArgs": [],
-    "python.testing.pytestEnabled": true,
-    "python.formatting.provider": "black"
+    "python.unitTest.pyTestArgs": [],
+    "python.unitTest.pyTestEnabled": true
 }

samples/smoketest/CosmosDB.py

@@ -1,13 +1,13 @@
-import os
 from azure.cosmos import CosmosClient
 from azure.cosmos.partition_key import PartitionKey
+import os
 
 class CosmosDB:
     def __init__(self):
         URL = os.environ["COSMOS_ENDPOINT"]
         KEY = os.environ["COSMOS_KEY"]
-        self.client = CosmosClient(URL, {"masterKey": KEY})
-        self.dbName = "pySolarSystem"
+        self.client = CosmosClient(URL,{'masterKey': KEY})
+        self.dbName="pySolarSystem"
 
     def CreateDatabase(self):
         print("Creating '{0}' database...".format(self.dbName))
@@ -16,41 +16,53 @@ def CreateDatabase(self):
     def CreateContainer(self, db):
         collectionName = "Planets"
         print("Creating '{0}' collection...".format(collectionName))
-        partition_key = PartitionKey(path="/id", kind="Hash")
+        partition_key = PartitionKey(path='/id', kind='Hash')
         return db.create_container(id="Planets", partition_key=partition_key)
 
     def CreateDocuments(self, container):
         # Cosmos will look for an 'id' field in the items, if the 'id' is not specify Cosmos is going to assing a random key.
         planets = [
             {
-                "id": "Earth",
-                "HasRings": False,
-                "Radius": 3959,
-                "Moons": [{"Name": "Moon"}],
-            },
+            'id' : "Earth",
+            'HasRings' : False,
+            'Radius' : 3959,
+            'Moons' : 
+                [
+                    {
+                        'Name' : "Moon"
+                    }
+                ]
+                },
             {
-                "id": "Mars",
-                "HasRings": False,
-                "Radius": 2106,
-                "Moons": [{"Name": "Phobos"}, {"Name": "Deimos"}],
-            },
-        ]
+            "id" : "Mars",
+            "HasRings" : False,
+            "Radius" : 2106,
+            "Moons" : 
+                [
+                    {
+                        "Name" : "Phobos"
+                    },
+                    {
+                        "Name" : "Deimos"
+                    }
+                ]
+            }
+            ]
 
         print("Inserting items in the collection...")
         for planet in planets:
             container.create_item(planet)
-            print("\t'{0}' created".format(planet["id"]))
+            print("\t'{0}' created".format(planet['id']))
         print("\tdone")
 
     def SimpleQuery(self, container):
         print("Quering the container...")
-        items = list(
-            container.query_items(
-                query="SELECT c.id FROM c", enable_cross_partition_query=True
-            )
-        )
+        items = list(container.query_items(
+            query="SELECT c.id FROM c",
+            enable_cross_partition_query = True
+        ))
         print("\tdone: {0}".format(items))
-
+    
     def DeleteDatabase(self):
         print("Cleaning up the resource...")
         self.client.delete_database(self.dbName)
@@ -66,18 +78,18 @@ def Run(self):
         print("3) Insert Documents (items) into the Container")
         print("4) Delete Database (Clean up the resource)")
         print()
-
+        
         # Ensure that the database does not exists
         try:
             self.DeleteDatabase()
         except:
             pass
-
+        
         try:
             db = self.CreateDatabase()
             container = self.CreateContainer(db=db)
             self.CreateDocuments(container=container)
-            self.SimpleQuery(container=container)
+            self.SimpleQuery(container=container)            
         finally:
             # if something goes wrong, the resource should be cleaned anyway
-            self.DeleteDatabase()
+            self.DeleteDatabase()

samples/smoketest/EventHubs.py

@@ -1,54 +1,41 @@
-import os
-from datetime import datetime
 from azure.eventhub import EventHubClient, EventData, EventPosition
-
+from datetime import datetime
+import os
 
 class EventHub:
     def __init__(self):
         # This test requires a previusly created Event Hub.
         # In this example the name is "myeventhub", but it could be change below
         connectionString = os.environ["EVENT_HUBS_CONNECTION_STRING"]
-        eventHubName = "myeventhub"
-        self.client = EventHubClient.from_connection_string(
-            connectionString, eventHubName
-        )
+        eventHubName = 'myeventhub'
+        self.client = EventHubClient.from_connection_string(connectionString, eventHubName)
 
     def GetPartitionIds(self):
         print("Getting partitions id...")
         partition_ids = self.client.get_partition_ids()
         print("\tdone")
-        return partition_ids
+        return partition_ids      
 
     def SendAndReceiveEvents(self, partitionID):
-        with self.client.create_consumer(
-            consumer_group="$default",
-            partition_id=partitionID,
-            event_position=EventPosition(datetime.utcnow()),
-        ) as consumer:
+        with self.client.create_consumer(consumer_group="$default", partition_id=partitionID, event_position=EventPosition(datetime.utcnow())) as consumer:
 
             print("Sending events...")
             with self.client.create_producer(partition_id=partitionID) as producer:
                 event_list = [
                     EventData(b"Test Event 1 in Python"),
-                    EventData(b"Test Event 2 in Python"),
-                    EventData(b"Test Event 3 in Python"),
-                ]
+                    EventData(b"Test Event 2 in Python"),EventData(b"Test Event 3 in Python")]
                 producer.send(event_list)
             print("\tdone")
-
+            
             print("Receiving events...")
             received = consumer.receive(max_batch_size=len(event_list), timeout=2)
             for event_data in received:
                 print("\tEvent Received: " + event_data.body_as_str())
 
             print("\tdone")
 
-            if len(received) != len(event_list):
-                raise Exception(
-                    "Error, expecting {0} events, but {1} were received.".format(
-                        str(len(event_list)), str(len(received))
-                    )
-                )
+            if(len(received) != len(event_list)):
+                raise Exception("Error, expecting {0} events, but {1} were received.".format(str(len(event_list)),str(len(received))))
 
     def Run(self):
         print()
@@ -61,6 +48,6 @@ def Run(self):
         print()
 
         partitionID = self.GetPartitionIds()
-        # In this sample the same partition id is going to be used for the producer and consumer,
-        # It is the first one, but it could be any (is not relevant as long as it is the same in both producer and consumer)
-        self.SendAndReceiveEvents(partitionID[0])
+        #In this sample the same partition id is going to be used for the producer and consumer,
+        #It is the first one, but it could be any (is not relevant as long as it is the same in both producer and consumer)
+        self.SendAndReceiveEvents(partitionID[0])

samples/smoketest/KeyVaultSecrets.py

@@ -1,7 +1,6 @@
-import os
 from azure.identity import DefaultAzureCredential
 from azure.keyvault.secrets import SecretClient
-
+import os
 
 class KeyVault:
     def __init__(self):
@@ -10,9 +9,7 @@ def __init__(self):
         # * AZURE_CLIENT_SECRET
         # * AZURE_TENANT_ID
         credential = DefaultAzureCredential()
-        self.secret_client = SecretClient(
-            vault_url=os.environ["AZURE_PROJECT_URL"], credential=credential
-        )
+        self.secret_client = SecretClient(vault_url=os.environ["AZURE_PROJECT_URL"], credential=credential)
 
     def SetSecret(self):
         print("Setting a secret...")
@@ -43,4 +40,4 @@ def Run(self):
             self.SetSecret()
             self.GetSecret()
         finally:
-            self.DeleteSecret()
+            self.DeleteSecret()

samples/smoketest/Program.py

@@ -10,4 +10,4 @@
 KeyVault().Run()
 StorageBlob().Run()
 EventHub().Run()
-CosmosDB().Run()
+CosmosDB().Run()

samples/smoketest/StorageBlobs.py

@@ -1,19 +1,15 @@
-import os
 from azure.storage.blob import BlobClient
-from azure.core import exceptions
-
+import os
 
 class StorageBlob:
     def __init__(self):
         connectionString = os.environ["STORAGE_CONNECTION_STRING"]
-        self.blob = BlobClient.from_connection_string(
-            connectionString, container="mycontainer", blob="pyTestBlob.txt"
-        )
+        self.blob = BlobClient.from_connection_string(connectionString, container="mycontainer", blob="pyTestBlob.txt")
 
     def UploadBLob(self):
         print("uploading blob...")
-        data = "This is a sample data for Python Test"
-        self.blob.upload_blob(data)
+        self.data = "This is a sample data for Python Test"
+        self.blob.upload_blob(self.data)
         print("\tdone")
 
     def DownloadBlob(self):
@@ -37,15 +33,15 @@ def Run(self):
         print("2) Download a Blob")
         print("3) Delete that Blob (Clean up the resource)")
         print()
-
-        # Ensure that the blob does not exists before the tests
+        
+        #Ensure that the blob does not exists before the tests
         try:
             self.DeleteBlob()
-        except exceptions.AzureError:
+        except:
             pass
-
+        
         try:
             self.UploadBLob()
             self.DownloadBlob()
         finally:
-            self.DeleteBlob()
+            self.DeleteBlob()