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

Merge pull request #2894 from hugovk/avoid-random-noise-failure

Browse Source 
Test: avoid random noise failure
This commit is contained in:
wiredfool 2017-12-20 09:26:49 +00:00 committed by GitHub
commit c4a91f05ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tests/helper.py
View File

@ -20,6 +20,7 @@ try:
except ImportError: except ImportError:
pass pass
def convert_to_comparable(a, b): def convert_to_comparable(a, b):
new_a, new_b = a, b new_a, new_b = a, b
if a.mode == 'P': if a.mode == 'P':
@ -97,10 +98,10 @@ class PillowTestCase(unittest.TestCase):
if HAS_UPLOADER: if HAS_UPLOADER:
try: try:
url = test_image_results.upload(a, b) url = test_image_results.upload(a, b)
logger.error("Url for test images: %s" %url) logger.error("Url for test images: %s" % url)
except: except:
pass pass
self.fail(msg or "got different content") self.fail(msg or "got different content")
def assert_image_similar(self, a, b, epsilon, msg=None): def assert_image_similar(self, a, b, epsilon, msg=None):
@ -130,7 +131,7 @@ class PillowTestCase(unittest.TestCase):
if HAS_UPLOADER: if HAS_UPLOADER:
try: try:
url = test_image_results.upload(a, b) url = test_image_results.upload(a, b)
logger.error("Url for test images: %s" %url) logger.error("Url for test images: %s" % url)
except: except:
pass pass
raise e raise e
@ -161,6 +162,12 @@ class PillowTestCase(unittest.TestCase):
self.assertTrue(found) self.assertTrue(found)
return result return result
def assert_all_same(self, items, msg=None):
self.assertTrue(items.count(items[0]) == len(items), msg)
def assert_not_all_same(self, items, msg=None):
self.assertFalse(items.count(items[0]) == len(items), msg)
def skipKnownBadTest(self, msg=None, platform=None, def skipKnownBadTest(self, msg=None, platform=None,
travis=None, interpreter=None): travis=None, interpreter=None):
# Skip if platform/travis matches, and # Skip if platform/travis matches, and
@ -201,12 +208,13 @@ class PillowTestCase(unittest.TestCase):
return Image.open(outfile) return Image.open(outfile)
raise IOError() raise IOError()
@unittest.skipIf(sys.platform.startswith('win32'), "requires Unix or MacOS") @unittest.skipIf(sys.platform.startswith('win32'), "requires Unix or MacOS")
class PillowLeakTestCase(PillowTestCase): class PillowLeakTestCase(PillowTestCase):
# requires unix/osx # requires unix/osx
iterations = 100 # count iterations = 100 # count
mem_limit = 512 # k mem_limit = 512 # k
def _get_mem_usage(self): def _get_mem_usage(self):
""" """
Gets the RUSAGE memory usage, returns in K. Encapsulates the difference Gets the RUSAGE memory usage, returns in K. Encapsulates the difference
@ -214,8 +222,8 @@ class PillowLeakTestCase(PillowTestCase):
:returns; memory usage in kilobytes :returns; memory usage in kilobytes
""" """
from resource import getpagesize, getrusage, RUSAGE_SELF from resource import getrusage, RUSAGE_SELF
mem = getrusage(RUSAGE_SELF).ru_maxrss mem = getrusage(RUSAGE_SELF).ru_maxrss
if sys.platform == 'darwin': if sys.platform == 'darwin':
# man 2 getrusage: # man 2 getrusage:
@ -225,7 +233,7 @@ class PillowLeakTestCase(PillowTestCase):
# linux # linux
# man 2 getrusage # man 2 getrusage
# ru_maxrss (since Linux 2.6.32) # ru_maxrss (since Linux 2.6.32)
# This is the maximum resident set size used (in kilobytes). # This is the maximum resident set size used (in kilobytes).
return mem # Kb return mem # Kb
def _test_leak(self, core): def _test_leak(self, core):
@ -309,6 +317,7 @@ def imagemagick_available():
def on_appveyor(): def on_appveyor():
return 'APPVEYOR' in os.environ return 'APPVEYOR' in os.environ
if sys.platform == 'win32': if sys.platform == 'win32':
IMCONVERT = os.environ.get('MAGICK_HOME', '') IMCONVERT = os.environ.get('MAGICK_HOME', '')
if IMCONVERT: if IMCONVERT:

30
Tests/test_image.py
View File

@ -22,7 +22,7 @@ class TestImage(PillowTestCase):
'BGR;15', 'BGR;16', 'BGR;24', 'BGR;32' 'BGR;15', 'BGR;16', 'BGR;24', 'BGR;32'
]: ]:
with self.assertRaises(ValueError) as e: with self.assertRaises(ValueError) as e:
Image.new(mode, (1, 1)); Image.new(mode, (1, 1))
self.assertEqual(str(e.exception), 'unrecognized image mode') self.assertEqual(str(e.exception), 'unrecognized image mode')
def test_sanity(self): def test_sanity(self):
@ -236,9 +236,9 @@ class TestImage(PillowTestCase):
self.assertEqual(img_colors, expected_colors) self.assertEqual(img_colors, expected_colors)
def test_alpha_inplace(self): def test_alpha_inplace(self):
src = Image.new('RGBA', (128,128), 'blue') src = Image.new('RGBA', (128, 128), 'blue')
over = Image.new('RGBA', (128,128), 'red') over = Image.new('RGBA', (128, 128), 'red')
mask = hopper('L') mask = hopper('L')
over.putalpha(mask) over.putalpha(mask)
@ -275,17 +275,18 @@ class TestImage(PillowTestCase):
# errors # errors
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, "invalid source") source.alpha_composite, over, "invalid source")
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, (0, 0), "invalid destination") source.alpha_composite, over, (0, 0),
"invalid destination")
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, (0)) source.alpha_composite, over, (0))
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, (0, 0), (0)) source.alpha_composite, over, (0, 0), (0))
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, (0, -1)) source.alpha_composite, over, (0, -1))
self.assertRaises(ValueError, self.assertRaises(ValueError,
source.alpha_composite, over, (0, 0), (0, -1)) source.alpha_composite, over, (0, 0), (0, -1))
def test_registered_extensions_uninitialized(self): def test_registered_extensions_uninitialized(self):
# Arrange # Arrange
@ -354,7 +355,12 @@ class TestImage(PillowTestCase):
# Assert # Assert
self.assertEqual(im.size, (100, 100)) self.assertEqual(im.size, (100, 100))
self.assertEqual(im.mode, "L") self.assertEqual(im.mode, "L")
self.assertNotEqual(im.getpixel((0, 0)), im.getpixel((0, 1))) p0 = im.getpixel((0, 0))
p1 = im.getpixel((0, 1))
p2 = im.getpixel((0, 2))
p3 = im.getpixel((0, 3))
p4 = im.getpixel((0, 4))
self.assert_not_all_same([p0, p1, p2, p3, p4])
def test_effect_spread(self): def test_effect_spread(self):
# Arrange # Arrange
@ -490,8 +496,8 @@ class TestImage(PillowTestCase):
im = hopper('RGB') im = hopper('RGB')
im_p = hopper('P') im_p = hopper('P')
blank_p = Image.new('P', (10,10)) blank_p = Image.new('P', (10, 10))
blank_pa = Image.new('PA', (10,10)) blank_pa = Image.new('PA', (10, 10))
blank_p.palette = None blank_p.palette = None
blank_pa.palette = None blank_pa.palette = None