diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 08:52:53 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 08:52:53 +0000 |
| commit | fe5f11c684ff44f45dcc38a671efc17b30fca055 (patch) | |
| tree | aec16686f7bff27621f163e486862d29f8f7a619 /Lib/test/support.py | |
| parent | ab91fdef1f1e556203a2eee98ba7d379e4790de9 (diff) | |
| download | cpython-git-fe5f11c684ff44f45dcc38a671efc17b30fca055.tar.gz | |
Merged revisions 73718,73721,73723 via svnmerge from
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
................
Diffstat (limited to 'Lib/test/support.py')
| -rw-r--r-- | Lib/test/support.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 337a33fcfa..f916f4abec 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -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: |