From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 21 Apr 2010 01:51:57 +0000 (+0000)
Subject: Merged revisions 80144 via svnmerge from
X-Git-Tag: v3.2a1~1072
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edcfeba449ad5cb2c2e858b0ba7bc5c9271a28d2;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 80144 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80144 | r.david.murray | 2010-04-17 01:26:26 -0400 (Sat, 17 Apr 2010) | 8 lines

  Issue #3864: Skip three test_signal tests on freebsd6 due to platform bug.

  Two itimer tests and an interprocess signal test fail on FreeBSD 6 if
  any test that starts a thread runs before test_signal.  Since FreeBSD7
  does not show this behavior, the bug is most likely a platform bug,
  so this patch just skips the failing tests on freebsd6.
........
---

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 6f4a7bfc74e5..a7c030ebb15c 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -139,6 +139,10 @@ class InterProcessSignalTests(unittest.TestCase):
             self.fail("pause returned of its own accord, and the signal"
                       " didn't arrive after another second.")
 
+    # Issue 3864, unknown if this affects earlier versions of freebsd also
+    @unittest.skipIf(sys.platform=='freebsd6',
+        'inter process signals not reliable (do not mix well with threading) '
+        'on freebsd6')
     def test_main(self):
         # This function spawns a child process to insulate the main
         # test-running process from all the signals. It then
@@ -355,6 +359,9 @@ 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')
     def test_itimer_virtual(self):
         self.itimer = signal.ITIMER_VIRTUAL
         signal.signal(signal.SIGVTALRM, self.sig_vtalrm)
@@ -376,6 +383,9 @@ class ItimerTest(unittest.TestCase):
         # and the handler should have been called
         self.assertEquals(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')
     def test_itimer_prof(self):
         self.itimer = signal.ITIMER_PROF
         signal.signal(signal.SIGPROF, self.sig_prof)
diff --git a/Misc/NEWS b/Misc/NEWS
index fc3b4c0a441b..100075ea41a0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1096,6 +1096,9 @@ Documentation
 Tests
 -----
 
+- Issue #3864: Skip three test_signal tests on freebsd6 because they fail
+  if any thread was previously started, most likely due to a platform bug.
+
 - Issue #8193: Fix test_zlib failure with zlib 1.2.4.
 
 - Issue #8248: Add some tests for the bool type.  Patch by Gregory Nofi.