summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/test
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-04-22 00:53:47 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-04-22 00:53:47 (GMT)
commit3141a6379b6b50202628be3a23b4dc9203fe3534 (patch)
tree291f2f526dfbd5e6fd1fa4eaa59e319e6d5a95b1 /Lib/unittest/test
parent3035c3925c8499a37f8c845997360b3c4d0502f6 (diff)
downloadcpython-3141a6379b6b50202628be3a23b4dc9203fe3534.zip
cpython-3141a6379b6b50202628be3a23b4dc9203fe3534.tar.gz
cpython-3141a6379b6b50202628be3a23b4dc9203fe3534.tar.bz2
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. ........
Diffstat (limited to 'Lib/unittest/test')
-rw-r--r--Lib/unittest/test/test_break.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py
index 9108a2c..4f89e87 100644
--- 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):