[Python-checkins] r81546 - in python/branches/release31-maint: Lib/test/test_socketserver.py Misc/NEWS

[victor.stinner]

Author: victor.stinner
Date: Wed May 26 19:35:09 2010
New Revision: 81546

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_socketserver.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/test/test_socketserver.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_socketserver.py	(original)
+++ python/branches/release31-maint/Lib/test/test_socketserver.py	Wed May 26 19:35:09 2010
@@ -61,6 +61,7 @@
     testcase.assertEquals(72 << 8, status)
 
 
+ at unittest.skipUnless(threading, 'Threading required for this test.')
 class SocketServerTest(unittest.TestCase):
     """Test all socket servers."""
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed May 26 19:35:09 2010
@@ -226,6 +226,8 @@
 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).