diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2010-10-17 04:23:21 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2010-10-17 04:23:21 (GMT) |
| commit | 397cd8a1fc22c8cbc6f5840a1813fd0f418ee841 (patch) | |
| tree | b90649b7b5d9ddce2f412e1ab69641b0d6565d4f /Lib/test/test_signal.py | |
| parent | 67295c3533af5a1f1d29627df73f590c6da35195 (diff) | |
| download | cpython-397cd8a1fc22c8cbc6f5840a1813fd0f418ee841.zip cpython-397cd8a1fc22c8cbc6f5840a1813fd0f418ee841.tar.gz cpython-397cd8a1fc22c8cbc6f5840a1813fd0f418ee841.tar.bz2 | |
Merged revisions 85586-85587,85596-85598 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85586 | gregory.p.smith | 2010-10-16 17:17:24 -0700 (Sat, 16 Oct 2010) | 2 lines
fix for netbsd.
........
r85587 | gregory.p.smith | 2010-10-16 17:43:10 -0700 (Sat, 16 Oct 2010) | 3 lines
applying netbsd-wizs-mod.patch from issue5510 -
fixes for netbsd (and dragonflybsd?)
........
r85596 | gregory.p.smith | 2010-10-16 19:14:36 -0700 (Sat, 16 Oct 2010) | 6 lines
Fix multiprocessing Semaphore's on netbsd5. SEM_VALUE_MAX is defined
as (~0U) on NetBSD which was causing it to appear as -1 when used as
a signed int for _multprocessing.SemLock.SEM_VALUE_MAX. This works
around the problem by substituting INT_MAX on systems where it appears
negative when used as an int.
........
r85597 | gregory.p.smith | 2010-10-16 19:57:19 -0700 (Sat, 16 Oct 2010) | 2 lines
skip test_itimer_virtual on NetBSD to prevent the test suite from hanging.
........
r85598 | gregory.p.smith | 2010-10-16 20:09:12 -0700 (Sat, 16 Oct 2010) | 2 lines
Avoid hanging the test on netbsd5.
........
Diffstat (limited to 'Lib/test/test_signal.py')
| -rw-r--r-- | Lib/test/test_signal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 1f15ff7..83ac669 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -438,8 +438,8 @@ class ItimerTest(unittest.TestCase): self.assertEqual(self.hndl_called, True) # Issue 3864, unknown if this affects earlier versions of freebsd also - @unittest.skipIf(sys.platform=='freebsd6', - 'itimer not reliable (does not mix well with threading) on freebsd6') + @unittest.skipIf(sys.platform in ('freebsd6', 'netbsd5'), + 'itimer not reliable (does not mix well with threading) on some BSDs.') def test_itimer_virtual(self): self.itimer = signal.ITIMER_VIRTUAL signal.signal(signal.SIGVTALRM, self.sig_vtalrm) |