Merged revisions 80155 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80155 | r.david.murray | 2010-04-17 17:59:26 -0400 (Sat, 17 Apr 2010) | 5 lines

  Issue #8263: On freebsd6 the unittest 'break' test stops regrtest; skip it.

  This is presumably related to issue 3864, and appears to be due
  to a platform bug on freebsd6.
........

diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py
index 9108a2c60cb76fa9fcdd8019658ea6fb6a492c4e..4f89e87715ff7bc854353adc641f0e338ae91b6c 100644 (file)
--- a/Lib/unittest/test/test_break.py
+++ b/Lib/unittest/test/test_break.py
@@ -10,6 +10,8 @@ import unittest
 
 @unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill")
 @unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows")
+@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 "
+    "if threads have been used")
 class TestBreak(unittest.TestCase):
 
     def setUp(self):