Merge 3.3.

bfc02452 · Stefan Krah · 53e10cc5 · fc4aa76d · bfc02452
Commit bfc02452 authored Jan 17, 2013 by Stefan Krah
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Lib/test/test_threading.py Lib/test/test_threading.py +2 -1

No files found.
--- 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: