From f6da42fd5af0954d6d8a4f1cde08a56aca17fafd Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 26 May 2010 17:35:09 +0000 Subject: [PATCH] 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 ........ ................ --- 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 0ab95d18d3e..6819f301962 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 7e1769d7866..a7a672376af 100644 --- 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).