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 73718,73721,73723 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

................
  r73718 | benjamin.peterson | 2009-07-01 01:35:19 +0200 (Mi, 01 Jul 2009) | 9 lines

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

  ........
    r73717 | benjamin.peterson | 2009-06-30 18:30:12 -0500 (Tue, 30 Jun 2009) | 1 line

    use assert* methods in test_unittest
  ........
................
  r73721 | benjamin.peterson | 2009-07-01 02:43:10 +0200 (Mi, 01 Jul 2009) | 11 lines

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

  ........
    r73720 | benjamin.peterson | 2009-06-30 19:36:41 -0500 (Tue, 30 Jun 2009) | 4 lines

    fix a few cases where automated fail -> assert translation messed up

    Thanks Joe Amenta
  ........
................
  r73723 | benjamin.peterson | 2009-07-01 02:45:43 +0200 (Mi, 01 Jul 2009) | 1 line

  remove use of failIf
................
This commit is contained in:
Georg Brandl 2009-08-13 08:52:53 +00:00
parent ab91fdef1f
commit fe5f11c684
4 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/support.py
View file

@ -731,7 +731,7 @@ def bigmemtest(minsize, memuse, overhead=5*_1M):
# to make sure they work. We still want to avoid using
# too much memory, though, but we do that noisily.
maxsize = 5147
self.failIf(maxsize * memuse + overhead > 20 * _1M)
self.assertFalse(maxsize * memuse + overhead > 20 * _1M)
else:
maxsize = int((max_memuse - overhead) / memuse)
if maxsize < minsize: