Commit 59440100 authored by Jason Madden's avatar Jason Madden

One test in test_threading.py fails under PyPy 2.6; that test has been removed...

One test in test_threading.py fails under PyPy 2.6; that test has been removed from upstream (https://bitbucket.org/pypy/pypy/diff/lib-python/2.7/test/test_threading.py?diff2=4ecd94a66a87&at=vendor/stdlib) so don't run it here either. I'm not updating the whole module yet because we run tests under 2.5.0 on Travis.
parent da98c895
...@@ -707,6 +707,9 @@ class ThreadJoinOnShutdown(BaseTestCase): ...@@ -707,6 +707,9 @@ class ThreadJoinOnShutdown(BaseTestCase):
self.assertScriptHasOutput(script, output) self.assertScriptHasOutput(script, output)
@unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug")
@unittest.skipIf(sys.pypy_version_info[:2] >= (2,6),
"This test was removed in CPython 2.7.9, and fails under PyPy 2.6 "
"with 'RuntimeError: stream lock is not held' in random_io")
def test_6_daemon_threads(self): def test_6_daemon_threads(self):
# Check that a daemon thread cannot crash the interpreter on shutdown # Check that a daemon thread cannot crash the interpreter on shutdown
# by manipulating internal structures that are being disposed of in # by manipulating internal structures that are being disposed of in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment