mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 66703,66708 via svnmerge from

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

........
  r66703 | gregory.p.smith | 2008-09-30 15:41:13 -0500 (Tue, 30 Sep 2008) | 6 lines

  Works around issue3863: freebsd4/5/6 and os2emx are known to have OS bugs when
  calling fork() from a child thread.  This disables that unit test (with a note
  printed to stderr) on those platforms.

  A caveat about buggy platforms is added to the os.fork documentation.
........
  r66708 | andrew.macintyre | 2008-09-30 22:25:25 -0500 (Tue, 30 Sep 2008) | 9 lines

  fix for issue 3862: test_array fails FreeBSD 7 amd64

  FreeBSD 7's underlying malloc() is behaves differently to earlier versions
  and seriously overcommits available memory on amd64.  This may affect
  other 64bit platforms in some circumstances, so the scale of the
  problematic test is wound back.

  Patch by Mark Dickinson, reviewed by Martin von Loewis.
........
This commit is contained in:
Benjamin Peterson 2008-10-10 22:20:52 +00:00
parent cf8016a8d6
commit bcd8ac3964
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_array.py
View file

@ -964,20 +964,21 @@ class DoubleTest(FPTest):
minitemsize = 8
def test_alloc_overflow(self):
from sys import maxsize
a = array.array('d', [-1]*65536)
try:
a *= 65536
a *= maxsize//65536 + 1
except MemoryError:
pass
else:
self.fail("a *= 2**16 didn't raise MemoryError")
self.fail("Array of size > maxsize created - MemoryError expected")
b = array.array('d', [ 2.71828183, 3.14159265, -1])
try:
b * 1431655766
b * (maxsize//3 + 1)
except MemoryError:
pass
else:
self.fail("a * 1431655766 didn't raise MemoryError")
self.fail("Array of size > maxsize created - MemoryError expected")
tests.append(DoubleTest)

6
Lib/test/test_threading.py
View file

@ -397,6 +397,12 @@ class ThreadJoinOnShutdown(unittest.TestCase):
import os
if not hasattr(os, 'fork'):
return
# Skip platforms with known problems forking from a worker thread.
# See http://bugs.python.org/issue3863.
if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'):
print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
' due to known OS bugs on'), sys.platform
return
script = """if 1:
main_thread = threading.current_thread()
def worker():