Fixing tests

hardwarelibrary/__init__.py

@@ -1,7 +1,7 @@
 __version__ = "1.0.5"
 __author__ = "Daniel Cote <dccote@cervo.ulaval.ca>"
 
-__all__ = ["communication","motion","oscilloscope","powermeters","spectrometers"]
+__all__ = ["communication", "motion", "oscilloscope", "powermeters", "spectrometers"]
 
 # We want the modules at the top level
 from .devicemanager import *
@@ -14,6 +14,6 @@
 import hardwarelibrary.spectrometers
 import hardwarelibrary.oscilloscope
 import hardwarelibrary.motion
-# import hardwarelibrary.cameras
 
-#import sources #TODO: Not much to see here yet
+# import hardwarelibrary.cameras #TODO: Not much to see here yet
+# import hardwarelibrary.sources #TODO: Not much to see here yet

hardwarelibrary/daq/labjackdevice.py

@@ -5,8 +5,8 @@
 class LabjackDevice(PhysicalDevice, AnalogIOProtocol, DigitalIOProtocol):
     classIdVendor = 0x0cd5
     classIdProduct = 0x003
-    def __init__(self, serialNumber="*"):
-        super().__init__(serialNumber, idProduct=0x003, idVendor=0x0cd5)
+    def __init__(self, serialNumber="*", idProduct=0x003, idVendor=0x0cd5):
+        super().__init__(serialNumber, idProduct=idProduct, idVendor=idVendor)
         self.dev = None
 
     def doInitializeDevice(self):

hardwarelibrary/devicemanager.py

@@ -218,7 +218,7 @@ def usbDeviceConnected(self, usbDevice):
             # This may throw if incompat:
             #                 deviceInstanceible
             try:
-                candidateClass(serialNumber=descriptor.serialNumber,
+                deviceInstance = candidateClass(serialNumber=descriptor.serialNumber,
                                             idProduct=descriptor.idProduct,
                                             idVendor=descriptor.idVendor)
                 deviceInstance.initializeDevice()

hardwarelibrary/spectrometers/oceaninsight.py

@@ -815,6 +815,12 @@ class USB2000Plus(USB4000_2000Plus):
     def __init__(self, serialNumber=None, idProduct:int = None, idVendor:int = None):
         USB4000_2000Plus.__init__(self, serialNumber=serialNumber, idProduct=idProduct, idVendor=idVendor, model="USB2000+")
 
+class SAS(USB4000_2000Plus):
+    classIdProduct = 0x1006
+
+    def __init__(self, serialNumber=None, idProduct:int = None, idVendor:int = None):
+        USB4000_2000Plus.__init__(self, serialNumber=serialNumber, idProduct=idProduct, idVendor=idVendor)
+
 
 class DebugSpectro:
     class Emitter(NamedTuple):

hardwarelibrary/tests/testIntegraDevice.py

@@ -12,7 +12,10 @@ class TestIntegraDevice(unittest.TestCase):
     def setUp(self):
         self.device = IntegraDevice()
         self.assertIsNotNone(self.device)
-        self.device.initializeDevice()
+        try:
+            self.device.initializeDevice()
+        except Exception as err:
+            self.skipTest("No IntegraDevice connected")
 
     def tearDown(self):
         self.device.shutdownDevice()
@@ -39,8 +42,8 @@ def setUp(self):
         self.port = USBPort(idVendor=0x1ad5, idProduct=0x0300, interfaceNumber=0, defaultEndPoints=(1,2))
         try:
             self.port.open()
-        except:
-            raise (unittest.SkipTest("No devices connected"))
+        except Exception as err:
+            self.skipTest("No IntegraDevice connected")
 
     def tearDown(self):
         self.port.close()

hardwarelibrary/tests/testIntellidrive.py

@@ -13,7 +13,7 @@ def setUp(self):
         self.portPath = None
         ports = serial.tools.list_ports.comports()
         for port in ports:
-            if port.vid == 0x0403 and port.pid == 0x6001: # Sutter Instruments
+            if port.vid == 0x0403 and port.pid == 0x6001:
                 self.portPath = "/dev/cu.usbserial-{0}".format(serialNumber)
 
         if self.portPath is None:

hardwarelibrary/tests/testLabjackU3.py

@@ -11,9 +11,12 @@
 class TestLabjackDevice(unittest.TestCase):
     def setUp(self):
         super().setUp()
-        self.device = LabjackDevice()
-        self.assertIsNotNone(self.device)
-        self.device.initializeDevice()
+        try:
+            self.device = LabjackDevice()
+            self.assertIsNotNone(self.device)
+            self.device.initializeDevice()
+        except Exception as err:
+            self.skipTest("No Labjack connected")
 
     def tearDown(self):
         super().tearDown()

hardwarelibrary/tests/testLinearMotionDevice.py

@@ -174,8 +174,14 @@ def setUp(self):
 
 class TestRealSutterDeviceBase(BaseTestCases.TestLinearMotionDevice):
     def setUp(self):
-        self.device = SutterDevice()
+
+        try:
+            self.device = SutterDevice()
+        except Exception as err:
+            self.skipTest("No Sutter device connected")
+
         super().setUp()
 
+
 if __name__ == '__main__':
     unittest.main()