Release 1.4.2

hardbyte · hardbyte · commit 634b920abcce · 2016-01-12T23:32:36.000+11:00
Includes a few fixes to the can_logger configuration.
Tests that require CAN hardware are now skipped by default.
diff --git a/bin/can_logger.py b/bin/can_logger.py
@@ -18,6 +18,7 @@
 import datetime
 import argparse
 import time
+import socket
 
 import can
 
@@ -35,7 +36,7 @@
 
     parser.add_argument('-c', '--channel', help='''Most backend interfaces require some sort of channel.
     For example with the serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
-    With the socketcan interfaces valid channel examples include: "can0", "vcan0"''', default=can.rc['channel'])
+    With the socketcan interfaces valid channel examples include: "can0", "vcan0"''')
 
     parser.add_argument('-i', '--interface', dest="interface",
                         help='''Specify the backend CAN interface to use. If left blank,
@@ -56,7 +57,7 @@
 
     can_filters = []
     if len(results.filter) > 0:
-        print('we have filter/s', results.filter)
+        print('Adding filter/s', results.filter)
         for filt in results.filter:
             if ':' in filt:
                 _ = filt.split(":")
diff --git a/can/interfaces/interface.py b/can/interfaces/interface.py
@@ -22,7 +22,7 @@ def __new__(cls, other, channel=None, *args, **kwargs):
             if can.rc['interface'] == 'socketcan':
                 can.rc['interface'] = choose_socketcan_implementation()
 
-        if 'interface' not in can.rc or 'channel' not in can.rc:
+        if 'interface' not in can.rc or 'channel' not in can.rc or can.rc['interface'] is None:
             can.log.debug("Loading default configuration")
             # Load defaults
             can.rc = load_config()
diff --git a/can/interfaces/socketcan_native.py b/can/interfaces/socketcan_native.py
@@ -299,6 +299,12 @@ def __init__(self, channel, **kwargs):
                                    socket.CAN_RAW_FILTER,
                                    struct.pack(can_filter_fmt, *filter_data),
                                    )
+        if channel is None:
+            # We know we are socketcan, a channel "should" have
+            # been given but we can assume "can0"
+            log.warn("Channel not given. Falling back to using 'can0'")
+            channel = 'can0'
+
         bindSocket(self.socket, channel)
         super(SocketscanNative_Bus, self).__init__()
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -66,7 +66,7 @@
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '1.4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = "1.4.1"
+__version__ = "1.4.2"
 
 import logging
 logging.basicConfig(level=logging.WARNING)
diff --git a/test/j1939_test.py b/test/j1939_test.py
@@ -75,15 +75,16 @@ def testTooLongAMessage(self):
         with self.assertRaises(AssertionError):
             j1939.PDU(arbitration_id=self.arbitration_id, data=data)
 
+
+@unittest.skipIf('interface' not in can.rc, "Need a CAN interface")
 class J1939BusTest(unittest.TestCase):
 
     def testCreateBus(self):
         self.bus = j1939.Bus(channel=can_interface)
         self.bus.shutdown()
 
-
+@unittest.skipIf('interface' not in can.rc, "Need a CAN interface")
 class NetworkJ1939Test(unittest.TestCase):
-
     """
 
     """
@@ -114,6 +115,7 @@ def _testSendingLongMessage(self):
             sleep(0.050)
             self.bus.send(m)
 
+    @unittest.expectedFailure
     def testReceivingLongMessage(self):
 
         data = [1, 2, 3, 4, 5, 6, 7, 8]
diff --git a/test/network_test.py b/test/network_test.py
@@ -17,9 +17,9 @@
 import can
 
 channel = 'vcan0'
-can.rc['interface'] = 'socketcan_ctypes'
+#can.rc['interface'] = 'socketcan_ctypes'
 
-unittest.skipIf('interface' not in can.rc, "Need a CAN interface")
+@unittest.skipIf('interface' not in can.rc, "Need a CAN interface")
 class ControllerAreaNetworkTestCase(unittest.TestCase):
     """
     This test ensures that what messages go in to the bus is what comes out.
@@ -67,6 +67,8 @@ def _testProducer(self):
         self.producer()
         logging.debug("producer test complete")
 
+
+
     def testProducerConsumer(self):
         logging.debug("testing producer/consumer")
         ready = threading.Event()
