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
........

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index eb72528f02c1adb5c024bda7c189af259ee4d539..deaeee18353c17168294e8af1053af2cd5029b3f 100644 (file)
--- 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."""
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 5d20ca43c5c726acccaf5a297b69b6ad7585987f..2065bb6e3c161ef1ac312de2bb4a906a020f60a4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1385,6 +1385,8 @@ Documentation
 Tests
 -----
 
+- Issue #7449: Skip test_socketserver if threading support is disabled
+
 - Issue #8672: Add a zlib test ensuring that an incomplete stream can be
   handled by a decompressor object without errors (it returns incomplete
   uncompressed data).