summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2013-01-17 22:36:08 (GMT)
committerStefan Krah <skrah@bytereef.org>2013-01-17 22:36:08 (GMT)
commitbfc02452a3e49cfaf51a068dc3668c8810a8b8de (patch)
tree43e59fbb72fb47eb491539269c30f8ad28d1b925 /Lib
parent53e10cc584e959c5b209d43e460ba523725dc446 (diff)
parentfc4aa76d59968a60ea91bda4b2c505e1070743ac (diff)
downloadcpython-bfc02452a3e49cfaf51a068dc3668c8810a8b8de.zip
cpython-bfc02452a3e49cfaf51a068dc3668c8810a8b8de.tar.gz
cpython-bfc02452a3e49cfaf51a068dc3668c8810a8b8de.tar.bz2
Merge 3.3.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_threading.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 13c017d..fff00f4 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -451,7 +451,8 @@ class ThreadJoinOnShutdown(BaseTestCase):
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
# on platforms known to behave badly.
- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5')
+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+ 'hp-ux11')
def _run_and_join(self, script):
script = """if 1: