summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-26 17:25:28 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-26 17:25:28 (GMT)
commit708c0727f9067cbf88f970f080125b7ec3128e24 (patch)
tree2ad94db811aa3b99595c44c16fca0c3d0572a0cf
parentc49dfcc8dcf5aec3151f7a76fd860ce0247f9bf9 (diff)
downloadcpython-708c0727f9067cbf88f970f080125b7ec3128e24.zip
cpython-708c0727f9067cbf88f970f080125b7ec3128e24.tar.gz
cpython-708c0727f9067cbf88f970f080125b7ec3128e24.tar.bz2
Issue #7449: Skip test_socketserver if threading support is disabled
-rw-r--r--Lib/test/test_socketserver.py1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index a478bd4..d4c4f63 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 e1b82a6..e313acc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,8 @@ Extension Modules
Tests
-----
+- Issue #7449: Skip test_socketserver if threading support is disabled
+
- On darwin, ``test_site`` assumed that a framework build was being used,
leading to a failure where four directories were expected for site-packages
instead of two in a non-framework build.