Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-13 15:21:01 -04:00
commit cd41e89377
1 changed files with 1 additions and 0 deletions

View File

@ -1461,6 +1461,7 @@ class BasicCANTest(unittest.TestCase):
@unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.')
@unittest.skipUnless(thread, 'Threading required for this test.')
class CANTest(ThreadedCANSocketTest):
def __init__(self, methodName='runTest'):