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
................
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 337a33f..f916f4a 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -731,7 +731,7 @@
# 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: