summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-10-03 19:39:55 (GMT)
committerGitHub <noreply@github.com>2017-10-03 19:39:55 (GMT)
commit27c623c845dd6e4b8e1782666ca3a956636da266 (patch)
tree34f5e36867c4bb5431c77e77c3b7f5cd0002cb99 /Lib/test
parent929b40a601db868530d6beaafb3256822103a7fb (diff)
downloadcpython-27c623c845dd6e4b8e1782666ca3a956636da266.zip
cpython-27c623c845dd6e4b8e1782666ca3a956636da266.tar.gz
cpython-27c623c845dd6e4b8e1782666ca3a956636da266.tar.bz2
bpo-31675: Fix memory leaks in Tkinter's methods splitlist() and split() (#3866)
when pass a string larger than 2 GiB. Decrease memory requirements for Tcl's bigmem tests.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_tcl.py54
1 files changed, 33 insertions, 21 deletions
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 8ffd185..db99b75 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -662,32 +662,44 @@ class BigmemTclTest(unittest.TestCase):
@support.bigmemtest(size=INT_MAX + 1, memuse=5, dry_run=False)
def test_huge_string_call(self, size):
value = ' ' * size
- self.assertRaises(OverflowError, self.interp.call, 'set', '_', value)
+ self.assertRaises(OverflowError, self.interp.call, 'string', 'index', value, 0)
@support.cpython_only
@unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
- @support.bigmemtest(size=INT_MAX + 1, memuse=9, dry_run=False)
+ @support.bigmemtest(size=INT_MAX + 1, memuse=2, dry_run=False)
def test_huge_string_builtins(self, size):
+ tk = self.interp.tk
value = '1' + ' ' * size
- self.assertRaises(OverflowError, self.interp.tk.getint, value)
- self.assertRaises(OverflowError, self.interp.tk.getdouble, value)
- self.assertRaises(OverflowError, self.interp.tk.getboolean, value)
- self.assertRaises(OverflowError, self.interp.eval, value)
- self.assertRaises(OverflowError, self.interp.evalfile, value)
- self.assertRaises(OverflowError, self.interp.record, value)
- self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
- self.assertRaises(OverflowError, self.interp.setvar, value, 'x', 'a')
- self.assertRaises(OverflowError, self.interp.setvar, 'x', value, 'a')
- self.assertRaises(OverflowError, self.interp.unsetvar, value)
- self.assertRaises(OverflowError, self.interp.unsetvar, 'x', value)
- self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
- self.assertRaises(OverflowError, self.interp.exprstring, value)
- self.assertRaises(OverflowError, self.interp.exprlong, value)
- self.assertRaises(OverflowError, self.interp.exprboolean, value)
- self.assertRaises(OverflowError, self.interp.splitlist, value)
- self.assertRaises(OverflowError, self.interp.split, value)
- self.assertRaises(OverflowError, self.interp.createcommand, value, max)
- self.assertRaises(OverflowError, self.interp.deletecommand, value)
+ self.assertRaises(OverflowError, tk.getint, value)
+ self.assertRaises(OverflowError, tk.getdouble, value)
+ self.assertRaises(OverflowError, tk.getboolean, value)
+ self.assertRaises(OverflowError, tk.eval, value)
+ self.assertRaises(OverflowError, tk.evalfile, value)
+ self.assertRaises(OverflowError, tk.record, value)
+ self.assertRaises(OverflowError, tk.adderrorinfo, value)
+ self.assertRaises(OverflowError, tk.setvar, value, 'x', 'a')
+ self.assertRaises(OverflowError, tk.setvar, 'x', value, 'a')
+ self.assertRaises(OverflowError, tk.unsetvar, value)
+ self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
+ self.assertRaises(OverflowError, tk.adderrorinfo, value)
+ self.assertRaises(OverflowError, tk.exprstring, value)
+ self.assertRaises(OverflowError, tk.exprlong, value)
+ self.assertRaises(OverflowError, tk.exprboolean, value)
+ self.assertRaises(OverflowError, tk.splitlist, value)
+ self.assertRaises(OverflowError, tk.split, value)
+ self.assertRaises(OverflowError, tk.createcommand, value, max)
+ self.assertRaises(OverflowError, tk.deletecommand, value)
+
+ @support.cpython_only
+ @unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
+ @support.bigmemtest(size=INT_MAX + 1, memuse=6, dry_run=False)
+ def test_huge_string_builtins2(self, size):
+ # These commands require larger memory for possible error messages
+ tk = self.interp.tk
+ value = '1' + ' ' * size
+ self.assertRaises(OverflowError, tk.evalfile, value)
+ self.assertRaises(OverflowError, tk.unsetvar, value)
+ self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
def setUpModule():