summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_bigmem.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-11-08 21:40:13 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-11-08 21:40:13 (GMT)
commitea510eba1a4fd2382cf4047d4e1042a6770f6867 (patch)
tree9ddeb4ec4f42c0487186f4973df0b6562fcfa98c /Lib/test/test_bigmem.py
parentd7ae299e4ba2b66145c2dea463f259d42b827917 (diff)
downloadcpython-ea510eba1a4fd2382cf4047d4e1042a6770f6867.zip
cpython-ea510eba1a4fd2382cf4047d4e1042a6770f6867.tar.gz
cpython-ea510eba1a4fd2382cf4047d4e1042a6770f6867.tar.bz2
Fix memory consumption advertised by some test cases
Diffstat (limited to 'Lib/test/test_bigmem.py')
-rw-r--r--Lib/test/test_bigmem.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py
index eda3e7c..c2357ee 100644
--- a/Lib/test/test_bigmem.py
+++ b/Lib/test/test_bigmem.py
@@ -821,6 +821,7 @@ class TupleTest(unittest.TestCase):
@precisionbigmemtest(size=_1G - 1, memuse=9)
def test_from_2G_generator(self, size):
+ self.skipTest("test needs much more memory than advertised, see issue5438")
try:
t = tuple(range(size))
except MemoryError:
@@ -834,6 +835,7 @@ class TupleTest(unittest.TestCase):
@precisionbigmemtest(size=_1G - 25, memuse=9)
def test_from_almost_2G_generator(self, size):
+ self.skipTest("test needs much more memory than advertised, see issue5438")
try:
t = tuple(range(size))
count = 0
@@ -854,11 +856,11 @@ class TupleTest(unittest.TestCase):
self.assertEquals(s[-5:], '0, 0)')
self.assertEquals(s.count('0'), size)
- @bigmemtest(minsize=_2G // 3 + 2, memuse=8 + 3)
+ @bigmemtest(minsize=_2G // 3 + 2, memuse=8 + 3 * character_size)
def test_repr_small(self, size):
return self.basic_test_repr(size)
- @bigmemtest(minsize=_2G + 2, memuse=8 + 3)
+ @bigmemtest(minsize=_2G + 2, memuse=8 + 3 * character_size)
def test_repr_large(self, size):
return self.basic_test_repr(size)
@@ -1029,11 +1031,11 @@ class ListTest(unittest.TestCase):
self.assertEquals(s[-5:], '0, 0]')
self.assertEquals(s.count('0'), size)
- @bigmemtest(minsize=_2G // 3 + 2, memuse=8 + 3)
+ @bigmemtest(minsize=_2G // 3 + 2, memuse=8 + 3 * character_size)
def test_repr_small(self, size):
return self.basic_test_repr(size)
- @bigmemtest(minsize=_2G + 2, memuse=8 + 3)
+ @bigmemtest(minsize=_2G + 2, memuse=8 + 3 * character_size)
def test_repr_large(self, size):
return self.basic_test_repr(size)