diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-04-16 16:32:49 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-04-16 16:32:49 (GMT) |
| commit | 466e9266d1fb057219624f8adb0d6872d9cc0b18 (patch) | |
| tree | cbe52d70457a78d44fdc50ac9e3cc1bb38035754 /Lib/test/test_os.py | |
| parent | f45c368f4dc40a9573a0464e3ac7c5c1678cb7f7 (diff) | |
| download | cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.zip cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.tar.gz cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.tar.bz2 | |
Merged revisions 80108,80111,80114-80115 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80108 | victor.stinner | 2010-04-16 13:23:43 +0100 (Fri, 16 Apr 2010) | 4 lines
Add CS_GNU_LIBC_VERSION and CS_GNU_LIBPTHREAD_VERSION constants for constr(),
and disable test_execvpe_with_bad_program() of test_os if the libc uses
linuxthreads to avoid the "unknown signal 32" bug (see issue #4970).
........
r80111 | mark.dickinson | 2010-04-16 13:47:52 +0100 (Fri, 16 Apr 2010) | 1 line
Keep confstr entries in alphabetical order.
........
r80114 | mark.dickinson | 2010-04-16 14:45:35 +0100 (Fri, 16 Apr 2010) | 1 line
Issue #4970: move linuxthreads check outside the affected test, and use skipIf
........
r80115 | mark.dickinson | 2010-04-16 14:51:27 +0100 (Fri, 16 Apr 2010) | 1 line
Don't assume that os.confstr_names exists.
........
Diffstat (limited to 'Lib/test/test_os.py')
| -rw-r--r-- | Lib/test/test_os.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 0c8e597..6134c93 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -10,6 +10,17 @@ import sys import shutil from test import support +# Detect whether we're on a Linux system that uses the (now outdated +# and unmaintained) linuxthreads threading library. There's an issue +# when combining linuxthreads with a failed execv call: see +# http://bugs.python.org/issue4970. +if (hasattr(os, "confstr_names") and + "CS_GNU_LIBPTHREAD_VERSION" in os.confstr_names): + libpthread = os.confstr("CS_GNU_LIBPTHREAD_VERSION") + USING_LINUXTHREADS= libpthread.startswith("linuxthreads") +else: + USING_LINUXTHREADS= False + # Tests creating TESTFN class FileTests(unittest.TestCase): def setUp(self): @@ -566,8 +577,11 @@ class URandomTests(unittest.TestCase): pass class ExecTests(unittest.TestCase): + @unittest.skipIf(USING_LINUXTHREADS, + "avoid triggering a linuxthreads bug: see issue #4970") def test_execvpe_with_bad_program(self): - self.assertRaises(OSError, os.execvpe, 'no such app-', ['no such app-'], None) + self.assertRaises(OSError, os.execvpe, 'no such app-', + ['no such app-'], None) def test_execvpe_with_bad_arglist(self): self.assertRaises(ValueError, os.execvpe, 'notepad', [], None) |