Fix CI

Author: annatisch

azure/eventhub/client.py

@@ -16,7 +16,6 @@
 except ImportError:
     from urllib.parse import urlparse, unquote_plus, urlencode, quote_plus
 
-import six
 import uamqp
 from uamqp import Message
 from uamqp import authentication

azure/eventhub/common.py

@@ -315,7 +315,7 @@ def __init__(self, message, details=None):
 
     def _parse_error(self, error_list):
         details = []
-        self.message = error_list if isinstance(error_list, six.text_types) else error_list.decode('UTF-8')
+        self.message = error_list if isinstance(error_list, six.text_type) else error_list.decode('UTF-8')
         details_index = self.message.find(" Reference:")
         if details_index >= 0:
             details_msg = self.message[details_index + 1:]

tests/asynctests/test_longrunning_eph.py

@@ -112,14 +112,17 @@ def test_long_running_eph():
     loop = asyncio.get_event_loop()
 
     # Storage Account Credentials
-    STORAGE_ACCOUNT_NAME = os.environ['AZURE_STORAGE_ACCOUNT']
-    STORAGE_KEY = os.environ['AZURE_STORAGE_SAS_KEY']
-    LEASE_CONTAINER_NAME = "testleases"
-
-    NAMESPACE = os.environ['EVENT_HUB_NAMESPACE']
-    EVENTHUB = os.environ['EVENT_HUB_NAME']
-    USER = os.environ['EVENT_HUB_SAS_POLICY']
-    KEY = os.environ['EVENT_HUB_SAS_KEY']
+    try:
+        STORAGE_ACCOUNT_NAME = os.environ['AZURE_STORAGE_ACCOUNT']
+        STORAGE_KEY = os.environ['AZURE_STORAGE_SAS_KEY']
+        LEASE_CONTAINER_NAME = "testleases"
+
+        NAMESPACE = os.environ['EVENT_HUB_NAMESPACE']
+        EVENTHUB = os.environ['EVENT_HUB_NAME']
+        USER = os.environ['EVENT_HUB_SAS_POLICY']
+        KEY = os.environ['EVENT_HUB_SAS_KEY']
+    except KeyError:
+        pytest.skip("Missing live configuration.")
 
     # Eventhub config and storage manager 
     eh_config = EventHubConfig(NAMESPACE, EVENTHUB, USER, KEY, consumer_group="$default")