summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-08-29 21:14:53 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-08-29 21:14:53 (GMT)
commitee763e2acc469fa2f423440517b9bc227fbbe79c (patch)
tree07daf6aa29d762ccc1c5f7fd1fc09196dcf1b13b /Lib/test/support.py
parent466517df0e272f1b5d46d4e5eed112cefec3d7e3 (diff)
parent82be19f889e97618d73f405ad53ceffbee462008 (diff)
downloadcpython-ee763e2acc469fa2f423440517b9bc227fbbe79c.zip
cpython-ee763e2acc469fa2f423440517b9bc227fbbe79c.tar.gz
cpython-ee763e2acc469fa2f423440517b9bc227fbbe79c.tar.bz2
Issue #11564: Avoid crashes when trying to pickle huge objects or containers
(more than 2**31 items). Instead, in most cases, an OverflowError is raised.
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r--Lib/test/support.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index b3989e5..d00a513 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1142,7 +1142,7 @@ def bigmemtest(minsize, memuse):
return wrapper
return decorator
-def precisionbigmemtest(size, memuse):
+def precisionbigmemtest(size, memuse, dry_run=True):
"""Decorator for bigmem tests that need exact sizes.
Like bigmemtest, but without the size scaling upward to fill available
@@ -1157,10 +1157,11 @@ def precisionbigmemtest(size, memuse):
else:
maxsize = size
- if real_max_memuse and real_max_memuse < maxsize * memuse:
- raise unittest.SkipTest(
- "not enough memory: %.1fG minimum needed"
- % (size * memuse / (1024 ** 3)))
+ if ((real_max_memuse or not dry_run)
+ and real_max_memuse < maxsize * memuse):
+ raise unittest.SkipTest(
+ "not enough memory: %.1fG minimum needed"
+ % (size * memuse / (1024 ** 3)))
return f(self, maxsize)
wrapper.size = size