Fix the unit tests

Author: IanBoden

src/wiotp/sdk/api/dsc/connectors.py

@@ -79,16 +79,16 @@ def __init__(self, apiClient):
     def find(self, nameFilter=None, typeFilter=None, enabledFilter=None, serviceId=None):
         """
         Gets the list of Historian connectors, they are used to configure the Watson IoT Platform to store IoT data in compatible services.
-        
+
         Parameters:
-        
+
             - nameFilter(string) -      Filter the results by the specified name
             - typeFilter(string) -      Filter the results by the specified type, Available values : cloudant, eventstreams
-            - enabledFilter(boolean) -  Filter the results by the enabled flag 
+            - enabledFilter(boolean) -  Filter the results by the enabled flag
             - serviceId(string) -       Filter the results by the service id
             - limit(number) -           Max number of results returned, defaults 25
             - bookmark(string) -        used for paging through results
-        
+
         Throws APIException on failure.
         """
 
@@ -106,7 +106,7 @@ def find(self, nameFilter=None, typeFilter=None, enabledFilter=None, serviceId=N
 
     def create(self, name, type, serviceId, timezone=None, description=None, enabled=None, configuration=None):
         """
-        Create a connector for the organization in the Watson IoT Platform. 
+        Create a connector for the organization in the Watson IoT Platform.
         The connector must reference the target service that the Watson IoT Platform will store the IoT data in.
         Parameters:
             - name (string)         - Name of the service

src/wiotp/sdk/api/registry/diag.py

@@ -11,10 +11,11 @@
 import json
 from datetime import datetime
 from collections import defaultdict
+
 try:
-  from collections.abc import MutableSequence
+    from collections.abc import MutableSequence
 except ImportError:
-  from collections import MutableSequence
+    from collections import MutableSequence
 from wiotp.sdk.exceptions import ApiException
 
 

src/wiotp/sdk/api/services/__init__.py

@@ -165,16 +165,16 @@ def __init__(self, apiClient):
 
     def find(self, nameFilter=None, typeFilter=None, bindingModeFilter=None, boundFilter=None):
         """
-        Gets the list of services that the Watson IoT Platform can connect to. 
+        Gets the list of services that the Watson IoT Platform can connect to.
         The list can include a mixture of services that are either bound or unbound.
-        
+
         Parameters:
-        
+
             - nameFilter(string) - Filter the results by the specified name
             - typeFilter(string) - Filter the results by the specified type, Available values : cloudant, eventstreams
             - bindingModeFilter(string) - Filter the results by the specified binding mode, Available values : automatic, manual
-            - boundFilter(boolean) - Filter the results by the bound flag 
-        
+            - boundFilter(boolean) - Filter the results by the bound flag
+
         Throws APIException on failure.
         """
 
@@ -192,9 +192,9 @@ def find(self, nameFilter=None, typeFilter=None, bindingModeFilter=None, boundFi
 
     def create(self, serviceBinding):
         """
-        Create a new external service. 
-        The service must include all of the details required to connect 
-        and authenticate to the external service in the credentials property. 
+        Create a new external service.
+        The service must include all of the details required to connect
+        and authenticate to the external service in the credentials property.
         Parameters:
             - serviceName (string) - Name of the service
             - serviceType (string) - must be either eventstreams or cloudant

src/wiotp/sdk/api/state/deviceTypes.py

@@ -21,6 +21,7 @@
 from wiotp.sdk.api.state.logicalInterfaces import BaseLogicalInterface
 from wiotp.sdk.api.state.physicalInterfaces import PhysicalInterface
 
+
 # =========================================================================
 # Physical Interface for the Device Type
 # =========================================================================
@@ -166,6 +167,7 @@ def __init__(self, apiClient, deviceTypeId):
 # Mappings for the Device Type
 # =========================================================================
 
+
 # define the common properties found on most Rest API Items
 class DeviceTypeMapping(defaultdict):
     def __init__(self, **kwargs):

src/wiotp/sdk/api/state/schemas.py

@@ -78,7 +78,6 @@ def __init__(self, apiClient):
         super(DraftSchemas, self).__init__(apiClient, Schema, IterableSchemaList, "api/v0002/draft/schemas")
 
     def create(self, name, schemaFileName, schemaContents, description):
-
         """
         Create a schema for the org.
         Returns: schemaId (string), response (object).

src/wiotp/sdk/api/state/thingTypes.py

@@ -179,6 +179,7 @@ def __init__(self, apiClient, thingTypeId):
 # Mappings for the Thing Type
 # =========================================================================
 
+
 # define the common properties found on most Rest API Items
 class ThingTypeMapping(defaultdict):
     def __init__(self, **kwargs):

src/wiotp/sdk/application/config.py

@@ -18,9 +18,9 @@
 
 class ApplicationClientConfig(defaultdict):
     def __init__(self, **kwargs):
-        if "auth" not in kwargs or kwargs["auth"] is None:
+        # previously quickstart supported unauthenticated connections but has been removed
+        if "auth" not in kwargs:
             raise ConfigurationException("Missing auth from configuration")
-
         if "key" not in kwargs["auth"] or kwargs["auth"]["key"] is None:
             raise ConfigurationException("Missing auth.key from configuration")
         if "token" not in kwargs["auth"] or kwargs["auth"]["token"] is None:
@@ -248,6 +248,11 @@ def parseEnvVars():
         "auth": {"key": authKey, "token": authToken}
     }
 
+<<<<<<< HEAD
+=======
+    cfg["auth"] = {"key": authKey, "token": authToken}
+
+>>>>>>> 1ec819d (Fix the unit tests)
     return ApplicationClientConfig(**cfg)
 
 

src/wiotp/sdk/client.py

@@ -132,7 +132,9 @@ def __init__(
         # paho 2.0.0 has a breaking change for callbacks to support both 2.0.0 and 1.x we need
         # to create a client in version1 mode if using 2.0.0
         if pahoVersion >= "2.0.0":
-            self.client = paho.Client(paho.CallbackAPIVersion.VERSION1, self.clientId, transport=transport, clean_session=(not cleanStart))
+            self.client = paho.Client(
+                paho.CallbackAPIVersion.VERSION1, self.clientId, transport=transport, clean_session=(not cleanStart)
+            )
         else:
             self.client = paho.Client(self.clientId, transport=transport, clean_session=(not cleanStart))
 

src/wiotp/sdk/device/command.py

@@ -15,20 +15,20 @@
 class Command:
     """
     Represents a command sent to a device.
-    
+
     # Parameters
     pahoMessage (?): ?
-    messageEncoderModules (dict): Dictionary of Python modules, keyed to the 
-        message format the module should use. 
-    
+    messageEncoderModules (dict): Dictionary of Python modules, keyed to the
+        message format the module should use.
+
     # Attributes
     command (string): Identifies the command.
     format (string): The format can be any string, for example JSON.
     data (dict): The data for the payload. Maximum length is 131072 bytes.
     timestamp (datetime): The date and time of the event.
 
     # Raises
-    InvalidEventException: If the command was recieved on a topic that does 
+    InvalidEventException: If the command was recieved on a topic that does
         not match the regular expression `iot-2/cmd/(.+)/fmt/(.+)`
     """
 

src/wiotp/sdk/device/config.py

@@ -216,6 +216,8 @@ def parseEnvVars():
         "auth": {"token": authToken}
     }
 
+    cfg["auth"] = {"token": authToken}
+
     return DeviceClientConfig(**cfg)