summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-26 17:33:03 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-26 17:33:03 (GMT)
commit5f22e72e6dc5e4fdebd6cd41a7f9692f986ce9d4 (patch)
tree77999e397f9ab1bb7bafc9c3c0ec8050c9effd55 /Lib
parent7f1bf8004de5584b42b1d4771caf12e3302ac506 (diff)
downloadcpython-5f22e72e6dc5e4fdebd6cd41a7f9692f986ce9d4.zip
cpython-5f22e72e6dc5e4fdebd6cd41a7f9692f986ce9d4.tar.gz
cpython-5f22e72e6dc5e4fdebd6cd41a7f9692f986ce9d4.tar.bz2
Merged revisions 81543 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81543 | victor.stinner | 2010-05-26 19:25:28 +0200 (mer., 26 mai 2010) | 2 lines Issue #7449: Skip test_socketserver if threading support is disabled ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socketserver.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index eb72528..deaeee1 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -61,6 +61,7 @@ def simple_subprocess(testcase):
testcase.assertEquals(72 << 8, status)
+@unittest.skipUnless(threading, 'Threading required for this test.')
class SocketServerTest(unittest.TestCase):
"""Test all socket servers."""