Merged revisions 81545 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81545 | victor.stinner | 2010-05-26 19:33:03 +0200 (mer., 26 mai 2010) | 9 lines

  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 0ab95d18d3ef9fefb9799022fd540554f09d6c18..6819f3019620b5aa9283d6421ea4f040c9f9e8ab 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 7e1769d7866609fd398094dcca72b7cbdb5de826..a7a672376af3da067857e97745c82a4615ded139 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -226,6 +226,8 @@ Build
 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).