python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-12 18:26:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Test style cleanup

Browse Source
This commit is contained in:
wiredfool 2014-12-30 16:57:24 -08:00
parent 0b75526ffe
commit 6696b780e3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tests/check_png_dos.py
View File

@ -1,23 +1,22 @@
from helper import unittest, PillowTestCase from helper import unittest, PillowTestCase
import sys
from PIL import Image, PngImagePlugin from PIL import Image, PngImagePlugin
from io import BytesIO from io import BytesIO
import zlib import zlib
test_file = "Tests/images/png_decompression_dos.png" TEST_FILE = "Tests/images/png_decompression_dos.png"
class TestPngDos(PillowTestCase): class TestPngDos(PillowTestCase):
def test_dos_text(self): def test_dos_text(self):
try: try:
im = Image.open(test_file) im = Image.open(TEST_FILE)
im.load() im.load()
except ValueError as msg: except ValueError as msg:
self.assert_(msg, "Decompressed Data Too Large") self.assertTrue(msg, "Decompressed Data Too Large")
return return
for s in im.text.values(): for s in im.text.values():
self.assert_(len(s) < 1024*1024, "Text chunk larger than 1M") self.assertLess(len(s), 1024*1024, "Text chunk larger than 1M")
def test_dos_total_memory(self): def test_dos_total_memory(self):
im = Image.new('L',(1,1)) im = Image.new('L',(1,1))
@ -36,13 +35,13 @@ class TestPngDos(PillowTestCase):
try: try:
im2 = Image.open(b) im2 = Image.open(b)
except ValueError as msg: except ValueError as msg:
self.assert_("Too much memory" in msg) self.assertIn("Too much memory", msg)
return return
total_len = 0 total_len = 0
for txt in im2.text.values(): for txt in im2.text.values():
total_len += len(txt) total_len += len(txt)
self.assert_(total_len < 64*1024*1024) self.assertLess(total_len, 64*1024*1024, "Total text chunks greater than 64M")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()