diff options
author | Christian Heimes <christian@cheimes.de> | 2007-11-30 22:12:06 +0000 |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2007-11-30 22:12:06 +0000 |
commit | 4e30a845b4d2496dab25f0016cb597072c7355b1 (patch) | |
tree | 53b84c8cc1edd2c893359b8a7552b38425b7e91a /Lib/test/test_bigmem.py | |
parent | 04a4eb3405eab76285a7693add2c4f00128fdf74 (diff) | |
download | cpython-git-4e30a845b4d2496dab25f0016cb597072c7355b1.tar.gz |
Merged revisions 59239-59244 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59240 | amaury.forgeotdarc | 2007-11-30 21:37:22 +0100 (Fri, 30 Nov 2007) | 2 lines
Add a NEWS entry for r59231
........
r59241 | amaury.forgeotdarc | 2007-11-30 21:51:40 +0100 (Fri, 30 Nov 2007) | 5 lines
Issue #1521: on 64bit platforms, str.decode fails on very long strings.
The t# and w# formats were not correctly handled.
Will backport.
........
r59242 | christian.heimes | 2007-11-30 22:11:28 +0100 (Fri, 30 Nov 2007) | 3 lines
Fix for feature request #1528 Add os.fchmod
Georg Brandl has added fchmod() and fchown(). I've contributed lchown but I'm not able to test it on Linux. However it should be available on Mac and some other flavors of Unix.
I've made a quick test of fchmod() and fchown() on my system. They are working as expected.
........
Diffstat (limited to 'Lib/test/test_bigmem.py')
-rw-r--r-- | Lib/test/test_bigmem.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py index 7244e1be14..652a523716 100644 --- a/Lib/test/test_bigmem.py +++ b/Lib/test/test_bigmem.py @@ -64,13 +64,15 @@ class StrTest(unittest.TestCase): self.assertEquals(s.count('i'), 1) self.assertEquals(s.count('j'), 0) - @bigmemtest(minsize=0, memuse=1) + @bigmemtest(minsize=_2G + 2, memuse=3) def test_decode(self, size): - pass + s = '.' * size + self.assertEquals(len(s.decode('utf-8')), size) - @bigmemtest(minsize=0, memuse=1) + @bigmemtest(minsize=_2G + 2, memuse=3) def test_encode(self, size): - pass + s = u'.' * size + self.assertEquals(len(s.encode('utf-8')), size) @bigmemtest(minsize=_2G, memuse=2) def test_endswith(self, size): |