python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-15 11:56:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2598 from wiredfool/test_relaxation

Browse Source 
Fix PNG leak tests
This commit is contained in:
wiredfool 2017-06-27 22:00:20 +01:00 committed by GitHub
commit 3dc3c8cef9
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tests/test_file_png.py
View File

@ -8,8 +8,8 @@ import sys
codecs = dir(Image.core) codecs = dir(Image.core)
# For Truncated phng memory leak # For Truncated phng memory leak
MEM_LIMIT = 1 # max increase in MB MEM_LIMIT = 2 # max increase in MB
ITERATIONS = 100 ITERATIONS = 100 # Leak is 56k/iteration, this will leak 5.6megs
# sample png stream # sample png stream
@ -542,13 +542,24 @@ class TestTruncatedPngPLeaks(PillowTestCase):
def _get_mem_usage(self): def _get_mem_usage(self):
from resource import getpagesize, getrusage, RUSAGE_SELF from resource import getpagesize, getrusage, RUSAGE_SELF
mem = getrusage(RUSAGE_SELF).ru_maxrss mem = getrusage(RUSAGE_SELF).ru_maxrss
return mem * getpagesize() / 1024 / 1024 if sys.platform == 'darwin':
# man 2 getrusage:
# ru_maxrss the maximum resident set size utilized (in bytes).
return mem / 1024 / 1024 # megs
else:
# linux
# man 2 getrusage
# ru_maxrss (since Linux 2.6.32)
# This is the maximum resident set size used (in kilobytes).
return mem / 1024 # megs
def test_leak_load(self): def test_leak_load(self):
with open('Tests/images/hopper.png', 'rb') as f: with open('Tests/images/hopper.png', 'rb') as f:
DATA = BytesIO(f.read(16 * 1024)) DATA = BytesIO(f.read(16 * 1024))
ImageFile.LOAD_TRUNCATED_IMAGES = True ImageFile.LOAD_TRUNCATED_IMAGES = True
with Image.open(DATA) as im:
im.load()
start_mem = self._get_mem_usage() start_mem = self._get_mem_usage()
try: try:
for _ in range(ITERATIONS): for _ in range(ITERATIONS):