diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-13 19:21:01 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-13 19:21:01 (GMT) |
| commit | cd41e89377940b2c3e0267df2ea0b84c27ae453b (patch) | |
| tree | 0e8bde69387e46adcd59d5023d9c3264e38005e7 /Lib/test/test_socket.py | |
| parent | 82fa90c06f98c3143377c75f98f7d7b187d4c863 (diff) | |
| parent | a40e6b0c9482c9aa7f94396430274251abfdf655 (diff) | |
| download | cpython-cd41e89377940b2c3e0267df2ea0b84c27ae453b.zip cpython-cd41e89377940b2c3e0267df2ea0b84c27ae453b.tar.gz cpython-cd41e89377940b2c3e0267df2ea0b84c27ae453b.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Lib/test/test_socket.py')
| -rw-r--r-- | Lib/test/test_socket.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 82b79cd..0712a4f 100644 --- 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'): |