Mercurial > cpython-lru_cache-weakref
annotate Lib/test/test_zlib.py @ 78069:a8aa77458e12 3.2
Add c_size_t and c_ssize_t to the ctypes summary table.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Thu, 12 Jul 2012 20:31:50 +0200 |
| parents | fc43b051ae1c |
| children | be882735e0b6 17562834a246 |
| rev | line source |
|---|---|
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
1 import unittest |
|
47201
9c930a32cebb
#2621 rename test.test_support to test.support
Benjamin Peterson <benjamin@python.org>
parents:
46370
diff
changeset
|
2 from test import support |
|
45931
1657f0acca78
Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45852
diff
changeset
|
3 import binascii |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
4 import random |
|
68054
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
5 import sys |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
6 from test.support import bigmemtest, _1G, _4G |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
7 |
|
52625
f84340886936
Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge
R. David Murray <rdmurray@bitdance.com>
parents:
49919
diff
changeset
|
8 zlib = support.import_module('zlib') |
|
f84340886936
Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge
R. David Murray <rdmurray@bitdance.com>
parents:
49919
diff
changeset
|
9 |
|
68054
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
10 try: |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
11 import mmap |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
12 except ImportError: |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
13 mmap = None |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
14 |
| 6069 | 15 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
16 class ChecksumTestCase(unittest.TestCase): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
17 # checksum test cases |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
18 def test_crc32start(self): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
19 self.assertEqual(zlib.crc32(b""), zlib.crc32(b"", 0)) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
20 self.assertTrue(zlib.crc32(b"abc", 0xffffffff)) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
21 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
22 def test_crc32empty(self): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
23 self.assertEqual(zlib.crc32(b"", 0), 0) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
24 self.assertEqual(zlib.crc32(b"", 1), 1) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
25 self.assertEqual(zlib.crc32(b"", 432), 432) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
26 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
27 def test_adler32start(self): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
28 self.assertEqual(zlib.adler32(b""), zlib.adler32(b"", 1)) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
29 self.assertTrue(zlib.adler32(b"abc", 0xffffffff)) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
30 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
31 def test_adler32empty(self): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
32 self.assertEqual(zlib.adler32(b"", 0), 0) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
33 self.assertEqual(zlib.adler32(b"", 1), 1) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
34 self.assertEqual(zlib.adler32(b"", 432), 432) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
35 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
36 def assertEqual32(self, seen, expected): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
37 # 32-bit values masked -- checksums on 32- vs 64- bit machines |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
38 # This is important if bit 31 (0x08000000L) is set. |
|
40644
1c26505c1de6
Rip out 'long' and 'L'-suffixed integer literals.
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
39 self.assertEqual(seen & 0x0FFFFFFFF, expected & 0x0FFFFFFFF) |
| 6069 | 40 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
41 def test_penguins(self): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
42 self.assertEqual32(zlib.crc32(b"penguin", 0), 0x0e5c1a120) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
43 self.assertEqual32(zlib.crc32(b"penguin", 1), 0x43b6aa94) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
44 self.assertEqual32(zlib.adler32(b"penguin", 0), 0x0bcf02f6) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
45 self.assertEqual32(zlib.adler32(b"penguin", 1), 0x0bd602f7) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
46 |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
47 self.assertEqual(zlib.crc32(b"penguin"), zlib.crc32(b"penguin", 0)) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
48 self.assertEqual(zlib.adler32(b"penguin"),zlib.adler32(b"penguin",1)) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
49 |
|
45805
6a7fa8421902
zlib.crc32 and zlib.adler32 now return an unsigned value as any sane person
Gregory P. Smith <greg@mad-scientist.com>
parents:
43734
diff
changeset
|
50 def test_crc32_adler32_unsigned(self): |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
51 foo = b'abcdefghijklmnop' |
|
45805
6a7fa8421902
zlib.crc32 and zlib.adler32 now return an unsigned value as any sane person
Gregory P. Smith <greg@mad-scientist.com>
parents:
43734
diff
changeset
|
52 # explicitly test signed behavior |
|
45951
132cf3a79126
crc32 always returns unsigned. cleanup the code a bit and revert r61648 with
Gregory P. Smith <greg@mad-scientist.com>
parents:
45935
diff
changeset
|
53 self.assertEqual(zlib.crc32(foo), 2486878355) |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
54 self.assertEqual(zlib.crc32(b'spam'), 1138425661) |
|
45805
6a7fa8421902
zlib.crc32 and zlib.adler32 now return an unsigned value as any sane person
Gregory P. Smith <greg@mad-scientist.com>
parents:
43734
diff
changeset
|
55 self.assertEqual(zlib.adler32(foo+foo), 3573550353) |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
56 self.assertEqual(zlib.adler32(b'spam'), 72286642) |
|
45805
6a7fa8421902
zlib.crc32 and zlib.adler32 now return an unsigned value as any sane person
Gregory P. Smith <greg@mad-scientist.com>
parents:
43734
diff
changeset
|
57 |
|
45931
1657f0acca78
Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45852
diff
changeset
|
58 def test_same_as_binascii_crc32(self): |
|
49919
ed8476d7f64a
Issue #4387: binascii now refuses to accept str as binary input.
Martin v. Löwis <martin@v.loewis.de>
parents:
49051
diff
changeset
|
59 foo = b'abcdefghijklmnop' |
|
45951
132cf3a79126
crc32 always returns unsigned. cleanup the code a bit and revert r61648 with
Gregory P. Smith <greg@mad-scientist.com>
parents:
45935
diff
changeset
|
60 crc = 2486878355 |
|
45931
1657f0acca78
Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45852
diff
changeset
|
61 self.assertEqual(binascii.crc32(foo), crc) |
|
1657f0acca78
Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45852
diff
changeset
|
62 self.assertEqual(zlib.crc32(foo), crc) |
|
49919
ed8476d7f64a
Issue #4387: binascii now refuses to accept str as binary input.
Martin v. Löwis <martin@v.loewis.de>
parents:
49051
diff
changeset
|
63 self.assertEqual(binascii.crc32(b'spam'), zlib.crc32(b'spam')) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
64 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
65 |
|
68054
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
66 # Issue #10276 - check that inputs >=4GB are handled correctly. |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
67 class ChecksumBigBufferTestCase(unittest.TestCase): |
|
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
68 |
|
75299
fc43b051ae1c
Issue #13873: Fix crash in test_zlib when running on a small (<4GB) tmpfs.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
72642
diff
changeset
|
69 @bigmemtest(size=_4G + 4, memuse=1, dry_run=False) |
|
fc43b051ae1c
Issue #13873: Fix crash in test_zlib when running on a small (<4GB) tmpfs.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
72642
diff
changeset
|
70 def test_big_buffer(self, size): |
|
fc43b051ae1c
Issue #13873: Fix crash in test_zlib when running on a small (<4GB) tmpfs.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
72642
diff
changeset
|
71 data = b"nyan" * (_1G + 1) |
|
fc43b051ae1c
Issue #13873: Fix crash in test_zlib when running on a small (<4GB) tmpfs.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
72642
diff
changeset
|
72 self.assertEqual(zlib.crc32(data), 1044521549) |
|
fc43b051ae1c
Issue #13873: Fix crash in test_zlib when running on a small (<4GB) tmpfs.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
72642
diff
changeset
|
73 self.assertEqual(zlib.adler32(data), 2256789997) |
|
68054
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
74 |
|
45852
30c4e1ca8421
Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45805
diff
changeset
|
75 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
76 class ExceptionTestCase(unittest.TestCase): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
77 # make sure we generate some expected errors |
|
43734
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
78 def test_badlevel(self): |
|
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
79 # specifying compression level out of range causes an error |
|
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
80 # (but -1 is Z_DEFAULT_COMPRESSION and apparently the zlib |
|
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
81 # accepts 0 too) |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
82 self.assertRaises(zlib.error, zlib.compress, b'ERROR', 10) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
83 |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
84 def test_badargs(self): |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
85 self.assertRaises(TypeError, zlib.adler32) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
86 self.assertRaises(TypeError, zlib.crc32) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
87 self.assertRaises(TypeError, zlib.compress) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
88 self.assertRaises(TypeError, zlib.decompress) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
89 for arg in (42, None, '', 'abc', (), []): |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
90 self.assertRaises(TypeError, zlib.adler32, arg) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
91 self.assertRaises(TypeError, zlib.crc32, arg) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
92 self.assertRaises(TypeError, zlib.compress, arg) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
93 self.assertRaises(TypeError, zlib.decompress, arg) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
94 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
95 def test_badcompressobj(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
96 # verify failure on building compress object with bad params |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
97 self.assertRaises(ValueError, zlib.compressobj, 1, zlib.DEFLATED, 0) |
|
43734
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
98 # specifying total bits too large causes an error |
|
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
99 self.assertRaises(ValueError, |
|
3e5edf19d5f0
Merged revisions 58221-58741 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41829
diff
changeset
|
100 zlib.compressobj, 1, zlib.DEFLATED, zlib.MAX_WBITS + 1) |
|
6237
03b8793f76c2
Many more tests, including tests of many optional arguments.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
6071
diff
changeset
|
101 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
102 def test_baddecompressobj(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
103 # verify failure on building decompress object with bad params |
|
60408
d51a2c7cc811
Merged revisions 79849 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
57736
diff
changeset
|
104 self.assertRaises(ValueError, zlib.decompressobj, -1) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
105 |
|
46370
2e917b0c8f6e
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45951
diff
changeset
|
106 def test_decompressobj_badflush(self): |
|
2e917b0c8f6e
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45951
diff
changeset
|
107 # verify failure on calling decompressobj.flush with bad params |
|
2e917b0c8f6e
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45951
diff
changeset
|
108 self.assertRaises(ValueError, zlib.decompressobj().flush, 0) |
|
2e917b0c8f6e
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45951
diff
changeset
|
109 self.assertRaises(ValueError, zlib.decompressobj().flush, -1) |
|
2e917b0c8f6e
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
45951
diff
changeset
|
110 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
111 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
112 class BaseCompressTestCase(object): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
113 def check_big_compress_buffer(self, size, compress_func): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
114 _1M = 1024 * 1024 |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
115 fmt = "%%0%dx" % (2 * _1M) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
116 # Generate 10MB worth of random, and expand it by repeating it. |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
117 # The assumption is that zlib's memory is not big enough to exploit |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
118 # such spread out redundancy. |
|
61370
bcb0cf924693
Merged revisions 80926 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60406
diff
changeset
|
119 data = b''.join([random.getrandbits(8 * _1M).to_bytes(_1M, 'little') |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
120 for i in range(10)]) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
121 data = data * (size // len(data) + 1) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
122 try: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
123 compress_func(data) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
124 finally: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
125 # Release memory |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
126 data = None |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
127 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
128 def check_big_decompress_buffer(self, size, decompress_func): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
129 data = b'x' * size |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
130 try: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
131 compressed = zlib.compress(data, 1) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
132 finally: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
133 # Release memory |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
134 data = None |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
135 data = decompress_func(compressed) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
136 # Sanity check |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
137 try: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
138 self.assertEqual(len(data), size) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
139 self.assertEqual(len(data.strip(b'x')), 0) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
140 finally: |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
141 data = None |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
142 |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
143 |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
144 class CompressTestCase(BaseCompressTestCase, unittest.TestCase): |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
145 # Test compression in one go (whole message compression) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
146 def test_speech(self): |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
147 x = zlib.compress(HAMLET_SCENE) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
148 self.assertEqual(zlib.decompress(x), HAMLET_SCENE) |
|
6237
03b8793f76c2
Many more tests, including tests of many optional arguments.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
6071
diff
changeset
|
149 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
150 def test_speech128(self): |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
151 # compress more data |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
152 data = HAMLET_SCENE * 128 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
153 x = zlib.compress(data) |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
154 self.assertEqual(zlib.compress(bytearray(data)), x) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
155 for ob in x, bytearray(x): |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
156 self.assertEqual(zlib.decompress(ob), data) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
157 |
|
61524
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
158 def test_incomplete_stream(self): |
|
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
159 # An useful error message is given |
|
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
160 x = zlib.compress(HAMLET_SCENE) |
|
66581
38bec90fd8ab
#10273: Rename assertRegexpMatches and assertRaisesRegexp to assertRegex and assertRaisesRegex.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
61523
diff
changeset
|
161 self.assertRaisesRegex(zlib.error, |
|
61524
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
162 "Error -5 while decompressing data: incomplete or truncated stream", |
|
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
163 zlib.decompress, x[:-1]) |
|
4b10ef8a024c
Merged revisions 81100 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61520
diff
changeset
|
164 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
165 # Memory use of the following functions takes into account overallocation |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
166 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
167 @bigmemtest(size=_1G + 1024 * 1024, memuse=3) |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
168 def test_big_compress_buffer(self, size): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
169 compress = lambda s: zlib.compress(s, 1) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
170 self.check_big_compress_buffer(size, compress) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
171 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
172 @bigmemtest(size=_1G + 1024 * 1024, memuse=2) |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
173 def test_big_decompress_buffer(self, size): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
174 self.check_big_decompress_buffer(size, zlib.decompress) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
175 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
176 @bigmemtest(size=_4G + 100, memuse=1) |
|
70103
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
177 def test_length_overflow(self, size): |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
178 if size < _4G + 100: |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
179 self.skipTest("not enough free memory, need at least 4 GB") |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
180 data = b'x' * size |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
181 try: |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
182 self.assertRaises(OverflowError, zlib.compress, data, 1) |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
183 self.assertRaises(OverflowError, zlib.decompress, data) |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
184 finally: |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
185 data = None |
|
850624632e9a
Issue #8650: Backport 64-bit safety fixes for compress() and decompress().
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70099
diff
changeset
|
186 |
| 6069 | 187 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
188 class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase): |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
189 # Test compression object |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
190 def test_pair(self): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
191 # straightforward compress/decompress objects |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
192 datasrc = HAMLET_SCENE * 128 |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
193 datazip = zlib.compress(datasrc) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
194 # should compress both bytes and bytearray data |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
195 for data in (datasrc, bytearray(datasrc)): |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
196 co = zlib.compressobj() |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
197 x1 = co.compress(data) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
198 x2 = co.flush() |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
199 self.assertRaises(zlib.error, co.flush) # second flush should not work |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
200 self.assertEqual(x1 + x2, datazip) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
201 for v1, v2 in ((x1, x2), (bytearray(x1), bytearray(x2))): |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
202 dco = zlib.decompressobj() |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
203 y1 = dco.decompress(v1 + v2) |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
204 y2 = dco.flush() |
|
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
205 self.assertEqual(data, y1 + y2) |
|
57734
49c68a2b0585
Issue #4757: `zlib.compress` and other methods in the zlib module now
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
206 self.assertIsInstance(dco.unconsumed_tail, bytes) |
|
49c68a2b0585
Issue #4757: `zlib.compress` and other methods in the zlib module now
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
207 self.assertIsInstance(dco.unused_data, bytes) |
|
23169
713ff889d094
Fix SF #544995 (zlib crash on second flush call)
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
20547
diff
changeset
|
208 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
209 def test_compressoptions(self): |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
210 # specify lots of options to compressobj() |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
211 level = 2 |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
212 method = zlib.DEFLATED |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
213 wbits = -12 |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
214 memlevel = 9 |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
215 strategy = zlib.Z_FILTERED |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
216 co = zlib.compressobj(level, method, wbits, memlevel, strategy) |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
217 x1 = co.compress(HAMLET_SCENE) |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
218 x2 = co.flush() |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
219 dco = zlib.decompressobj(wbits) |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
220 y1 = dco.decompress(x1 + x2) |
|
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
221 y2 = dco.flush() |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
222 self.assertEqual(HAMLET_SCENE, y1 + y2) |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
223 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
224 def test_compressincremental(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
225 # compress object in steps, decompress object as one-shot |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
226 data = HAMLET_SCENE * 128 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
227 co = zlib.compressobj() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
228 bufs = [] |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
229 for i in range(0, len(data), 256): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
230 bufs.append(co.compress(data[i:i+256])) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
231 bufs.append(co.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
232 combuf = b''.join(bufs) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
233 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
234 dco = zlib.decompressobj() |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
235 y1 = dco.decompress(b''.join(bufs)) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
236 y2 = dco.flush() |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
237 self.assertEqual(data, y1 + y2) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
238 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
239 def test_decompinc(self, flush=False, source=None, cx=256, dcx=64): |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
240 # compress object in steps, decompress object in steps |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
241 source = source or HAMLET_SCENE |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
242 data = source * 128 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
243 co = zlib.compressobj() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
244 bufs = [] |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
245 for i in range(0, len(data), cx): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
246 bufs.append(co.compress(data[i:i+cx])) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
247 bufs.append(co.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
248 combuf = b''.join(bufs) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
249 |
|
49051
c1a8f6b648ea
Fixes release blocker issue #3492 and #3790.
Gregory P. Smith <greg@mad-scientist.com>
parents:
48413
diff
changeset
|
250 decombuf = zlib.decompress(combuf) |
|
c1a8f6b648ea
Fixes release blocker issue #3492 and #3790.
Gregory P. Smith <greg@mad-scientist.com>
parents:
48413
diff
changeset
|
251 # Test type of return value |
|
58473
71acd4482e65
Merged revisions 77727 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
57734
diff
changeset
|
252 self.assertIsInstance(decombuf, bytes) |
|
49051
c1a8f6b648ea
Fixes release blocker issue #3492 and #3790.
Gregory P. Smith <greg@mad-scientist.com>
parents:
48413
diff
changeset
|
253 |
|
c1a8f6b648ea
Fixes release blocker issue #3492 and #3790.
Gregory P. Smith <greg@mad-scientist.com>
parents:
48413
diff
changeset
|
254 self.assertEqual(data, decombuf) |
|
6237
03b8793f76c2
Many more tests, including tests of many optional arguments.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
6071
diff
changeset
|
255 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
256 dco = zlib.decompressobj() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
257 bufs = [] |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
258 for i in range(0, len(combuf), dcx): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
259 bufs.append(dco.decompress(combuf[i:i+dcx])) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
260 self.assertEqual(b'', dco.unconsumed_tail, ######## |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
261 "(A) uct should be b'': not %d long" % |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
262 len(dco.unconsumed_tail)) |
|
48413
7e56016a6565
#3247 Get rid of Py_FindMethod; use tp_members instead.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
263 self.assertEqual(b'', dco.unused_data) |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
264 if flush: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
265 bufs.append(dco.flush()) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
266 else: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
267 while True: |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
268 chunk = dco.decompress(b'') |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
269 if chunk: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
270 bufs.append(chunk) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
271 else: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
272 break |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
273 self.assertEqual(b'', dco.unconsumed_tail, ######## |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
274 "(B) uct should be b'': not %d long" % |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
275 len(dco.unconsumed_tail)) |
|
48413
7e56016a6565
#3247 Get rid of Py_FindMethod; use tp_members instead.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
276 self.assertEqual(b'', dco.unused_data) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
277 self.assertEqual(data, b''.join(bufs)) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
278 # Failure means: "decompressobj with init options failed" |
|
6237
03b8793f76c2
Many more tests, including tests of many optional arguments.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
6071
diff
changeset
|
279 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
280 def test_decompincflush(self): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
281 self.test_decompinc(flush=True) |
|
6237
03b8793f76c2
Many more tests, including tests of many optional arguments.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
6071
diff
changeset
|
282 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
283 def test_decompimax(self, source=None, cx=256, dcx=64): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
284 # compress in steps, decompress in length-restricted steps |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
285 source = source or HAMLET_SCENE |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
286 # Check a decompression object with max_length specified |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
287 data = source * 128 |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
288 co = zlib.compressobj() |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
289 bufs = [] |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
290 for i in range(0, len(data), cx): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
291 bufs.append(co.compress(data[i:i+cx])) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
292 bufs.append(co.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
293 combuf = b''.join(bufs) |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
294 self.assertEqual(data, zlib.decompress(combuf), |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
295 'compressed data failure') |
| 6069 | 296 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
297 dco = zlib.decompressobj() |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
298 bufs = [] |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
299 cb = combuf |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
300 while cb: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
301 #max_length = 1 + len(cb)//10 |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
302 chunk = dco.decompress(cb, dcx) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
303 self.assertFalse(len(chunk) > dcx, |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
304 'chunk too big (%d>%d)' % (len(chunk), dcx)) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
305 bufs.append(chunk) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
306 cb = dco.unconsumed_tail |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
307 bufs.append(dco.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
308 self.assertEqual(data, b''.join(bufs), 'Wrong data retrieved') |
|
20466
60e12f83d2d2
[ #403753 ] zlib decompress; uncontrollable memory usage
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
19131
diff
changeset
|
309 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
310 def test_decompressmaxlen(self, flush=False): |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
311 # Check a decompression object with max_length specified |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
312 data = HAMLET_SCENE * 128 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
313 co = zlib.compressobj() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
314 bufs = [] |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
315 for i in range(0, len(data), 256): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
316 bufs.append(co.compress(data[i:i+256])) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
317 bufs.append(co.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
318 combuf = b''.join(bufs) |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
319 self.assertEqual(data, zlib.decompress(combuf), |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
320 'compressed data failure') |
|
20547
a12ccdbce8da
Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents:
20466
diff
changeset
|
321 |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
322 dco = zlib.decompressobj() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
323 bufs = [] |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
324 cb = combuf |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
325 while cb: |
|
28087
465405a159c1
Use floor division (//).
Guido van Rossum <guido@python.org>
parents:
27963
diff
changeset
|
326 max_length = 1 + len(cb)//10 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
327 chunk = dco.decompress(cb, max_length) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
328 self.assertFalse(len(chunk) > max_length, |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
329 'chunk too big (%d>%d)' % (len(chunk),max_length)) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
330 bufs.append(chunk) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
331 cb = dco.unconsumed_tail |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
332 if flush: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
333 bufs.append(dco.flush()) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
334 else: |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
335 while chunk: |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
336 chunk = dco.decompress(b'', max_length) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
337 self.assertFalse(len(chunk) > max_length, |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
338 'chunk too big (%d>%d)' % (len(chunk),max_length)) |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
339 bufs.append(chunk) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
340 self.assertEqual(data, b''.join(bufs), 'Wrong data retrieved') |
|
20466
60e12f83d2d2
[ #403753 ] zlib decompress; uncontrollable memory usage
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
19131
diff
changeset
|
341 |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
342 def test_decompressmaxlenflush(self): |
|
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
343 self.test_decompressmaxlen(flush=True) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
344 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
345 def test_maxlenmisc(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
346 # Misc tests of max_length |
|
32262
36798f1c8e9a
Remove lots of magic constants.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
30256
diff
changeset
|
347 dco = zlib.decompressobj() |
|
57736
919e2142726e
Merged revisions 76836 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
55593
diff
changeset
|
348 self.assertRaises(ValueError, dco.decompress, b"", -1) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
349 self.assertEqual(b'', dco.unconsumed_tail) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
350 |
|
70099
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
351 def test_clear_unconsumed_tail(self): |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
352 # Issue #12050: calling decompress() without providing max_length |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
353 # should clear the unconsumed_tail attribute. |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
354 cdata = b"x\x9cKLJ\x06\x00\x02M\x01" # "abc" |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
355 dco = zlib.decompressobj() |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
356 ddata = dco.decompress(cdata, 1) |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
357 ddata += dco.decompress(dco.unconsumed_tail) |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
358 self.assertEqual(dco.unconsumed_tail, b"") |
|
6a45567c7245
Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
69753
diff
changeset
|
359 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
360 def test_flushes(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
361 # Test flush() with the various options, using all the |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
362 # different levels in order to provide more variations. |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
363 sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH'] |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
364 sync_opt = [getattr(zlib, opt) for opt in sync_opt |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
365 if hasattr(zlib, opt)] |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
366 data = HAMLET_SCENE * 8 |
|
10439
9ce1474abddd
Added simple test for the flush() method of compression objects, trying the
Andrew M. Kuchling <amk@amk.ca>
parents:
8139
diff
changeset
|
367 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
368 for sync in sync_opt: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
369 for level in range(10): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
370 obj = zlib.compressobj( level ) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
371 a = obj.compress( data[:3000] ) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
372 b = obj.flush( sync ) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
373 c = obj.compress( data[3000:] ) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
374 d = obj.flush() |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
375 self.assertEqual(zlib.decompress(b''.join([a,b,c,d])), |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
376 data, ("Decompress failed: flush " |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
377 "mode=%i, level=%i") % (sync, level)) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
378 del obj |
|
16719
89c126887df0
Add test case from bug #124981: zlib decompress of sync-flushed data
Andrew M. Kuchling <amk@amk.ca>
parents:
16600
diff
changeset
|
379 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
380 def test_odd_flush(self): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
381 # Test for odd flushing bugs noted in 2.0, and hopefully fixed in 2.1 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
382 import random |
|
16719
89c126887df0
Add test case from bug #124981: zlib decompress of sync-flushed data
Andrew M. Kuchling <amk@amk.ca>
parents:
16600
diff
changeset
|
383 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
384 if hasattr(zlib, 'Z_SYNC_FLUSH'): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
385 # Testing on 17K of "random" data |
|
16719
89c126887df0
Add test case from bug #124981: zlib decompress of sync-flushed data
Andrew M. Kuchling <amk@amk.ca>
parents:
16600
diff
changeset
|
386 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
387 # Create compressor and decompressor objects |
|
32268
8e5958c93c88
Remove a number of tests that differ only in input data size. It seems
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
32262
diff
changeset
|
388 co = zlib.compressobj(zlib.Z_BEST_COMPRESSION) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
389 dco = zlib.decompressobj() |
|
19131
67698d689203
Patch #441091 from Finn Bock: the more advanced flush options are not
Andrew M. Kuchling <amk@amk.ca>
parents:
16723
diff
changeset
|
390 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
391 # Try 17K of data |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
392 # generate random data stream |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
393 try: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
394 # In 2.3 and later, WichmannHill is the RNG of the bug report |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
395 gen = random.WichmannHill() |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
396 except AttributeError: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
397 try: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
398 # 2.2 called it Random |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
399 gen = random.Random() |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
400 except AttributeError: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
401 # others might simply have a single RNG |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
402 gen = random |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
403 gen.seed(1) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
404 data = genblock(1, 17 * 1024, generator=gen) |
|
16719
89c126887df0
Add test case from bug #124981: zlib decompress of sync-flushed data
Andrew M. Kuchling <amk@amk.ca>
parents:
16600
diff
changeset
|
405 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
406 # compress, sync-flush, and decompress |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
407 first = co.compress(data) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
408 second = co.flush(zlib.Z_SYNC_FLUSH) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
409 expanded = dco.decompress(first + second) |
|
16723
59f1b57bc909
Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents:
16719
diff
changeset
|
410 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
411 # if decompressed data is different from the input data, choke. |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
412 self.assertEqual(expanded, data, "17K random source doesn't match") |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
413 |
|
34264
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
414 def test_empty_flush(self): |
|
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
415 # Test that calling .flush() on unused objects works. |
|
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
416 # (Bug #1083110 -- calling .flush() on decompress objects |
|
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
417 # caused a core dump.) |
|
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
418 |
|
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
419 co = zlib.compressobj(zlib.Z_BEST_COMPRESSION) |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
52625
diff
changeset
|
420 self.assertTrue(co.flush()) # Returns a zlib header |
|
34264
b2ecda4dd70f
[Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case
Andrew M. Kuchling <amk@amk.ca>
parents:
32268
diff
changeset
|
421 dco = zlib.decompressobj() |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
422 self.assertEqual(dco.flush(), b"") # Returns nothing |
|
35003
52fed2d0641a
whitespace normalisation
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34264
diff
changeset
|
423 |
|
61520
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
424 def test_decompress_incomplete_stream(self): |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
425 # This is 'foo', deflated |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
426 x = b'x\x9cK\xcb\xcf\x07\x00\x02\x82\x01E' |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
427 # For the record |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
428 self.assertEqual(zlib.decompress(x), b'foo') |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
429 self.assertRaises(zlib.error, zlib.decompress, x[:-5]) |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
430 # Omitting the stream end works with decompressor objects |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
431 # (see issue #8672). |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
432 dco = zlib.decompressobj() |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
433 y = dco.decompress(x[:-5]) |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
434 y += dco.flush() |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
435 self.assertEqual(y, b'foo') |
|
ef4de053d577
Merged revisions 81096 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61372
diff
changeset
|
436 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
437 if hasattr(zlib.compressobj(), "copy"): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
438 def test_compresscopy(self): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
439 # Test copying a compression object |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
440 data0 = HAMLET_SCENE |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
441 data1 = bytes(str(HAMLET_SCENE, "ascii").swapcase(), "ascii") |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
442 c0 = zlib.compressobj(zlib.Z_BEST_COMPRESSION) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
443 bufs0 = [] |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
444 bufs0.append(c0.compress(data0)) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
445 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
446 c1 = c0.copy() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
447 bufs1 = bufs0[:] |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
448 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
449 bufs0.append(c0.compress(data0)) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
450 bufs0.append(c0.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
451 s0 = b''.join(bufs0) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
452 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
453 bufs1.append(c1.compress(data1)) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
454 bufs1.append(c1.flush()) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
455 s1 = b''.join(bufs1) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
456 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
457 self.assertEqual(zlib.decompress(s0),data0+data0) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
458 self.assertEqual(zlib.decompress(s1),data0+data1) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
459 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
460 def test_badcompresscopy(self): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
461 # Test copying a compression object in an inconsistent state |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
462 c = zlib.compressobj() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
463 c.compress(HAMLET_SCENE) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
464 c.flush() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
465 self.assertRaises(ValueError, c.copy) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
466 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
467 if hasattr(zlib.decompressobj(), "copy"): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
468 def test_decompresscopy(self): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
469 # Test copying a decompression object |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
470 data = HAMLET_SCENE |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
471 comp = zlib.compress(data) |
|
49051
c1a8f6b648ea
Fixes release blocker issue #3492 and #3790.
Gregory P. Smith <greg@mad-scientist.com>
parents:
48413
diff
changeset
|
472 # Test type of return value |
|
58473
71acd4482e65
Merged revisions 77727 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
57734
diff
changeset
|
473 self.assertIsInstance(comp, bytes) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
474 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
475 d0 = zlib.decompressobj() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
476 bufs0 = [] |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
477 bufs0.append(d0.decompress(comp[:32])) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
478 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
479 d1 = d0.copy() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
480 bufs1 = bufs0[:] |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
481 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
482 bufs0.append(d0.decompress(comp[32:])) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
483 s0 = b''.join(bufs0) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
484 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
485 bufs1.append(d1.decompress(comp[32:])) |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
486 s1 = b''.join(bufs1) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
487 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
488 self.assertEqual(s0,s1) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
489 self.assertEqual(s0,data) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
35914
diff
changeset
|
490 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
491 def test_baddecompresscopy(self): |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
492 # Test copying a compression object in an inconsistent state |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
493 data = zlib.compress(HAMLET_SCENE) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
494 d = zlib.decompressobj() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
495 d.decompress(data) |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
496 d.flush() |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
497 self.assertRaises(ValueError, d.copy) |
|
16719
89c126887df0
Add test case from bug #124981: zlib decompress of sync-flushed data
Andrew M. Kuchling <amk@amk.ca>
parents:
16600
diff
changeset
|
498 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
499 # Memory use of the following functions takes into account overallocation |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
500 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
501 @bigmemtest(size=_1G + 1024 * 1024, memuse=3) |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
502 def test_big_compress_buffer(self, size): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
503 c = zlib.compressobj(1) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
504 compress = lambda s: c.compress(s) + c.flush() |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
505 self.check_big_compress_buffer(size, compress) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
506 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
507 @bigmemtest(size=_1G + 1024 * 1024, memuse=2) |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
508 def test_big_decompress_buffer(self, size): |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
509 d = zlib.decompressobj() |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
510 decompress = lambda s: d.decompress(s) + d.flush() |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
511 self.check_big_decompress_buffer(size, decompress) |
|
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
512 |
|
72642
bf39434dd506
Start fixing test_bigmem:
Antoine Pitrou <solipsis@pitrou.net>
parents:
70130
diff
changeset
|
513 @bigmemtest(size=_4G + 100, memuse=1) |
|
70118
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
514 def test_length_overflow(self, size): |
|
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
515 if size < _4G + 100: |
|
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
516 self.skipTest("not enough free memory, need at least 4 GB") |
|
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
517 data = b'x' * size |
|
70129
8db300ceceb7
Fix copy-paste mistake in new zlib test.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70118
diff
changeset
|
518 c = zlib.compressobj(1) |
|
8db300ceceb7
Fix copy-paste mistake in new zlib test.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70118
diff
changeset
|
519 d = zlib.decompressobj() |
|
70118
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
520 try: |
|
70129
8db300ceceb7
Fix copy-paste mistake in new zlib test.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70118
diff
changeset
|
521 self.assertRaises(OverflowError, c.compress, data) |
|
8db300ceceb7
Fix copy-paste mistake in new zlib test.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70118
diff
changeset
|
522 self.assertRaises(OverflowError, d.decompress, data) |
|
70118
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
523 finally: |
|
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
524 data = None |
|
0b5211d19a14
Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents:
70103
diff
changeset
|
525 |
|
61371
368371fa7f5c
Merged revisions 80928 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60408
diff
changeset
|
526 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
527 def genblock(seed, length, step=1024, generator=random): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
528 """length-byte stream of random data from a seed (in step-byte blocks).""" |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
529 if seed is not None: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
530 generator.seed(seed) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
531 randint = generator.randint |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
532 if length < step or step < 2: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
533 step = length |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
534 blocks = bytes() |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
535 for i in range(0, length, step): |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
536 blocks += bytes(randint(0, 255) for x in range(step)) |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
537 return blocks |
| 6069 | 538 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
539 |
| 6069 | 540 |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
541 def choose_lines(source, number, seed=None, generator=random): |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
542 """Return a list of number lines randomly chosen from the source""" |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
543 if seed is not None: |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
544 generator.seed(seed) |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
545 sources = source.split('\n') |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
546 return [generator.choice(sources) for n in range(number)] |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
547 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
548 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
549 |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
550 HAMLET_SCENE = b""" |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
551 LAERTES |
| 6069 | 552 |
| 553 O, fear me not. | |
| 554 I stay too long: but here my father comes. | |
| 555 | |
| 556 Enter POLONIUS | |
| 557 | |
| 558 A double blessing is a double grace, | |
| 559 Occasion smiles upon a second leave. | |
| 560 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
561 LORD POLONIUS |
| 6069 | 562 |
| 563 Yet here, Laertes! aboard, aboard, for shame! | |
| 564 The wind sits in the shoulder of your sail, | |
| 565 And you are stay'd for. There; my blessing with thee! | |
| 566 And these few precepts in thy memory | |
| 567 See thou character. Give thy thoughts no tongue, | |
| 568 Nor any unproportioned thought his act. | |
| 569 Be thou familiar, but by no means vulgar. | |
| 570 Those friends thou hast, and their adoption tried, | |
| 571 Grapple them to thy soul with hoops of steel; | |
| 572 But do not dull thy palm with entertainment | |
| 573 Of each new-hatch'd, unfledged comrade. Beware | |
| 574 Of entrance to a quarrel, but being in, | |
| 575 Bear't that the opposed may beware of thee. | |
| 576 Give every man thy ear, but few thy voice; | |
| 577 Take each man's censure, but reserve thy judgment. | |
| 578 Costly thy habit as thy purse can buy, | |
| 579 But not express'd in fancy; rich, not gaudy; | |
| 580 For the apparel oft proclaims the man, | |
| 581 And they in France of the best rank and station | |
| 582 Are of a most select and generous chief in that. | |
| 583 Neither a borrower nor a lender be; | |
| 584 For loan oft loses both itself and friend, | |
| 585 And borrowing dulls the edge of husbandry. | |
| 586 This above all: to thine ownself be true, | |
| 587 And it must follow, as the night the day, | |
| 588 Thou canst not then be false to any man. | |
| 589 Farewell: my blessing season this in thee! | |
| 590 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
591 LAERTES |
| 6069 | 592 |
| 593 Most humbly do I take my leave, my lord. | |
| 594 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
595 LORD POLONIUS |
| 6069 | 596 |
| 597 The time invites you; go; your servants tend. | |
| 598 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
599 LAERTES |
| 6069 | 600 |
| 601 Farewell, Ophelia; and remember well | |
| 602 What I have said to you. | |
| 603 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
604 OPHELIA |
| 6069 | 605 |
| 606 'Tis in my memory lock'd, | |
| 607 And you yourself shall keep the key of it. | |
| 608 | |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
13050
diff
changeset
|
609 LAERTES |
| 6069 | 610 |
| 611 Farewell. | |
| 612 """ | |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
613 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
614 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
615 def test_main(): |
|
47201
9c930a32cebb
#2621 rename test.test_support to test.support
Benjamin Peterson <benjamin@python.org>
parents:
46370
diff
changeset
|
616 support.run_unittest( |
|
28917
1741af48fd9f
Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents:
28087
diff
changeset
|
617 ChecksumTestCase, |
|
68054
f8a77fd675f5
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
61524
diff
changeset
|
618 ChecksumBigBufferTestCase, |
|
28917
1741af48fd9f
Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents:
28087
diff
changeset
|
619 ExceptionTestCase, |
|
1741af48fd9f
Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents:
28087
diff
changeset
|
620 CompressTestCase, |
|
1741af48fd9f
Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents:
28087
diff
changeset
|
621 CompressObjectTestCase |
|
1741af48fd9f
Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents:
28087
diff
changeset
|
622 ) |
|
27653
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
623 |
|
106a44a4b975
- Thanks to Scott David Daniels, a subtle bug in how the zlib
Guido van Rossum <guido@python.org>
parents:
24758
diff
changeset
|
624 if __name__ == "__main__": |
|
41829
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
625 unittest.main() # XXX |
|
f7f2a49c1f2e
zlib now uses bytes everywhere, and the test passes.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
626 ###test_main() |
