add testing flag to vector

felixdivo · felixdivo · commit 451ac0b1b61c · 2019-08-03T13:44:06.000+02:00
diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
@@ -98,7 +98,7 @@ def __init__(
             Which bitrate to use for data phase in CAN FD.
             Defaults to arbitration bitrate.
         """
-        if os.name != "nt":
+        if os.name != "nt" and not kwargs.get("testing", d=False):
             raise OSError(
                 f'The Vector interface is only supported on Windows, but you are running "{os.name}"'
             )
diff --git a/test/test_vector.py b/test/test_vector.py
@@ -18,6 +18,7 @@
 
 
 class TestVectorBus(unittest.TestCase):
+
     def setUp(self) -> None:
         # basic mock for XLDriver
         can.interfaces.vector.canlib.xldriver = Mock()
@@ -76,7 +77,7 @@ def tearDown(self) -> None:
             self.bus = None
 
     def test_bus_creation(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         self.assertIsInstance(self.bus, canlib.VectorBus)
         can.interfaces.vector.canlib.xldriver.xlOpenDriver.assert_called()
         can.interfaces.vector.canlib.xldriver.xlGetApplConfig.assert_called()
@@ -92,7 +93,7 @@ def test_bus_creation(self) -> None:
         can.interfaces.vector.canlib.xldriver.xlCanSetChannelBitrate.assert_not_called()
 
     def test_bus_creation_bitrate(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector", bitrate=200000)
+        self.bus = can.Bus(channel=0, bustype="vector", bitrate=200000, testing=True)
         self.assertIsInstance(self.bus, canlib.VectorBus)
         can.interfaces.vector.canlib.xldriver.xlOpenDriver.assert_called()
         can.interfaces.vector.canlib.xldriver.xlGetApplConfig.assert_called()
@@ -112,7 +113,7 @@ def test_bus_creation_bitrate(self) -> None:
         self.assertEqual(xlCanSetChannelBitrate_args[2], 200000)
 
     def test_bus_creation_fd(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector", fd=True)
+        self.bus = can.Bus(channel=0, bustype="vector", fd=True, testing=True)
         self.assertIsInstance(self.bus, canlib.VectorBus)
         can.interfaces.vector.canlib.xldriver.xlOpenDriver.assert_called()
         can.interfaces.vector.canlib.xldriver.xlGetApplConfig.assert_called()
@@ -141,6 +142,7 @@ def test_bus_creation_fd_bitrate_timings(self) -> None:
             sjwDbr=13,
             tseg1Dbr=14,
             tseg2Dbr=15,
+            testing=True,
         )
         self.assertIsInstance(self.bus, canlib.VectorBus)
         can.interfaces.vector.canlib.xldriver.xlOpenDriver.assert_called()
@@ -171,19 +173,19 @@ def test_bus_creation_fd_bitrate_timings(self) -> None:
         self.assertEqual(canFdConf.tseg2Dbr, 15)
 
     def test_receive(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         self.bus.recv(timeout=0.05)
         can.interfaces.vector.canlib.xldriver.xlReceive.assert_called()
         can.interfaces.vector.canlib.xldriver.xlCanReceive.assert_not_called()
 
     def test_receive_fd(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector", fd=True)
+        self.bus = can.Bus(channel=0, bustype="vector", fd=True, testing=True)
         self.bus.recv(timeout=0.05)
         can.interfaces.vector.canlib.xldriver.xlReceive.assert_not_called()
         can.interfaces.vector.canlib.xldriver.xlCanReceive.assert_called()
 
     def test_send(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         msg = can.Message(
             arbitration_id=0xC0FFEF, data=[1, 2, 3, 4, 5, 6, 7, 8], is_extended_id=True
         )
@@ -192,7 +194,7 @@ def test_send(self) -> None:
         can.interfaces.vector.canlib.xldriver.xlCanTransmitEx.assert_not_called()
 
     def test_send_fd(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector", fd=True)
+        self.bus = can.Bus(channel=0, bustype="vector", fd=True, testing=True)
         msg = can.Message(
             arbitration_id=0xC0FFEF, data=[1, 2, 3, 4, 5, 6, 7, 8], is_extended_id=True
         )
@@ -201,19 +203,19 @@ def test_send_fd(self) -> None:
         can.interfaces.vector.canlib.xldriver.xlCanTransmitEx.assert_called()
 
     def test_flush_tx_buffer(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         self.bus.flush_tx_buffer()
         can.interfaces.vector.canlib.xldriver.xlCanFlushTransmitQueue.assert_called()
 
     def test_shutdown(self) -> None:
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         self.bus.shutdown()
         can.interfaces.vector.canlib.xldriver.xlDeactivateChannel.assert_called()
         can.interfaces.vector.canlib.xldriver.xlClosePort.assert_called()
         can.interfaces.vector.canlib.xldriver.xlCloseDriver.assert_called()
 
     def test_reset(self):
-        self.bus = can.Bus(channel=0, bustype="vector")
+        self.bus = can.Bus(channel=0, bustype="vector", testing=True)
         self.bus.reset()
         can.interfaces.vector.canlib.xldriver.xlDeactivateChannel.assert_called()
         can.interfaces.vector.canlib.xldriver.xlActivateChannel.assert_called()

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def __init__(`
`98`	`98`	`Which bitrate to use for data phase in CAN FD.`
`99`	`99`	`Defaults to arbitration bitrate.`
`100`	`100`	`"""`
`101`		`- if os.name != "nt":`
	`101`	`+ if os.name != "nt" and not kwargs.get("testing", d=False):`
`102`	`102`	`raise OSError(`
`103`	`103`	`f'The Vector interface is only supported on Windows, but you are running "{os.name}"'`
`104`	`104`	`)`