From 5f22e72e6dc5e4fdebd6cd41a7f9692f986ce9d4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 26 May 2010 17:33:03 +0000 Subject: [PATCH] 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 ........ --- Lib/test/test_socketserver.py | 1 + Misc/NEWS | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index eb72528f02c..deaeee18353 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.""" diff --git a/Misc/NEWS b/Misc/NEWS index 5d20ca43c5c..2065bb6e3c1 100644 --- 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).