Merge with 3.4

cd41e893 · Terry Jan Reedy · 82fa90c0 · a40e6b0c · cd41e893
Commit cd41e893 authored Jun 13, 2014 by Terry Jan Reedy
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Lib/test/test_socket.py Lib/test/test_socket.py +1 -0

No files found.
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -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'):