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

Replace PillowTestCase.assert_warning with pytest.warns

Browse Source
This commit is contained in:
Hugo 2020-02-03 11:11:32 +02:00
parent 63881ab198
commit 38bf862185
24 changed files with 72 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tests/helper.py
View File

@ -178,31 +178,6 @@ class PillowTestCase(unittest.TestCase):
except OSError: except OSError:
pass # report? pass # report?
def assert_warning(self, warn_class, func, *args, **kwargs):
import warnings
with warnings.catch_warnings(record=True) as w:
# Cause all warnings to always be triggered.
warnings.simplefilter("always")
# Hopefully trigger a warning.
result = func(*args, **kwargs)
# Verify some things.
if warn_class is None:
self.assertEqual(
len(w), 0, "Expected no warnings, got %s" % [v.category for v in w]
)
else:
self.assertGreaterEqual(len(w), 1)
found = False
for v in w:
if issubclass(v.category, warn_class):
found = True
break
self.assertTrue(found)
return result
def tempfile(self, template): def tempfile(self, template):
assert template[:5] in ("temp.", "temp_") assert template[:5] in ("temp.", "temp_")
fd, path = tempfile.mkstemp(template[4:], template[:4]) fd, path = tempfile.mkstemp(template[4:], template[:4])

3
Tests/test_bmp_reference.py
View File

@ -1,5 +1,6 @@
import os import os
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, assert_image_similar from .helper import PillowTestCase, assert_image_similar
@ -28,7 +29,7 @@ class TestBmpReference(PillowTestCase):
pass pass
# Assert that there is no unclosed file warning # Assert that there is no unclosed file warning
self.assert_warning(None, open, f) pytest.warns(None, open, f)
def test_questionable(self): def test_questionable(self):
""" These shouldn't crash/dos, but it's not well defined that these """ These shouldn't crash/dos, but it's not well defined that these

7
Tests/test_core_resources.py
View File

@ -1,6 +1,7 @@
import sys import sys
import unittest import unittest
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, is_pypy from .helper import PillowTestCase, is_pypy
@ -169,12 +170,12 @@ class TestEnvVars(PillowTestCase):
self.assertEqual(Image.core.get_block_size(), 2 * 1024 * 1024) self.assertEqual(Image.core.get_block_size(), 2 * 1024 * 1024)
def test_warnings(self): def test_warnings(self):
self.assert_warning( pytest.warns(
UserWarning, Image._apply_env_variables, {"PILLOW_ALIGNMENT": "15"} UserWarning, Image._apply_env_variables, {"PILLOW_ALIGNMENT": "15"}
) )
self.assert_warning( pytest.warns(
UserWarning, Image._apply_env_variables, {"PILLOW_BLOCK_SIZE": "1024"} UserWarning, Image._apply_env_variables, {"PILLOW_BLOCK_SIZE": "1024"}
) )
self.assert_warning( pytest.warns(
UserWarning, Image._apply_env_variables, {"PILLOW_BLOCKS_MAX": "wat"} UserWarning, Image._apply_env_variables, {"PILLOW_BLOCKS_MAX": "wat"}
) )

7
Tests/test_decompression_bomb.py
View File

@ -1,3 +1,4 @@
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, hopper from .helper import PillowTestCase, hopper
@ -38,7 +39,7 @@ class TestDecompressionBomb(PillowTestCase):
with Image.open(TEST_FILE): with Image.open(TEST_FILE):
pass pass
self.assert_warning(Image.DecompressionBombWarning, open) pytest.warns(Image.DecompressionBombWarning, open)
def test_exception(self): def test_exception(self):
# Set limit to trigger exception on the test file # Set limit to trigger exception on the test file
@ -71,7 +72,7 @@ class TestDecompressionCrop(PillowTestCase):
# Crops can extend the extents, therefore we should have the # Crops can extend the extents, therefore we should have the
# same decompression bomb warnings on them. # same decompression bomb warnings on them.
box = (0, 0, self.src.width * 2, self.src.height * 2) box = (0, 0, self.src.width * 2, self.src.height * 2)
self.assert_warning(Image.DecompressionBombWarning, self.src.crop, box) pytest.warns(Image.DecompressionBombWarning, self.src.crop, box)
def test_crop_decompression_checks(self): def test_crop_decompression_checks(self):
@ -87,7 +88,7 @@ class TestDecompressionCrop(PillowTestCase):
self.assertEqual(im.crop(value).size, (9, 9)) self.assertEqual(im.crop(value).size, (9, 9))
for value in warning_values: for value in warning_values:
self.assert_warning(Image.DecompressionBombWarning, im.crop, value) pytest.warns(Image.DecompressionBombWarning, im.crop, value)
for value in error_values: for value in error_values:
with self.assertRaises(Image.DecompressionBombError): with self.assertRaises(Image.DecompressionBombError):

7
Tests/test_file_dcx.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import DcxImagePlugin, Image from PIL import DcxImagePlugin, Image
from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy
@ -27,7 +28,7 @@ class TestFileDcx(PillowTestCase):
im = Image.open(TEST_FILE) im = Image.open(TEST_FILE)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -35,14 +36,14 @@ class TestFileDcx(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(TEST_FILE) as im: with Image.open(TEST_FILE) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_invalid_file(self): def test_invalid_file(self):
with open("Tests/images/flower.jpg", "rb") as fp: with open("Tests/images/flower.jpg", "rb") as fp:

7
Tests/test_file_fli.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import FliImagePlugin, Image from PIL import FliImagePlugin, Image
from .helper import PillowTestCase, assert_image_equal, is_pypy from .helper import PillowTestCase, assert_image_equal, is_pypy
@ -34,7 +35,7 @@ class TestFileFli(PillowTestCase):
im = Image.open(static_test_file) im = Image.open(static_test_file)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -42,14 +43,14 @@ class TestFileFli(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(static_test_file) as im: with Image.open(static_test_file) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_tell(self): def test_tell(self):
# Arrange # Arrange

11
Tests/test_file_gif.py
View File

@ -1,6 +1,7 @@
import unittest import unittest
from io import BytesIO from io import BytesIO
import pytest
from PIL import GifImagePlugin, Image, ImageDraw, ImagePalette from PIL import GifImagePlugin, Image, ImageDraw, ImagePalette
from .helper import ( from .helper import (
@ -47,7 +48,7 @@ class TestFileGif(PillowTestCase):
im = Image.open(TEST_GIF) im = Image.open(TEST_GIF)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -55,14 +56,14 @@ class TestFileGif(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(TEST_GIF) as im: with Image.open(TEST_GIF) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_invalid_file(self): def test_invalid_file(self):
invalid_file = "Tests/images/flower.jpg" invalid_file = "Tests/images/flower.jpg"
@ -684,7 +685,7 @@ class TestFileGif(PillowTestCase):
# Single frame # Single frame
im = Image.new("RGB", (1, 1)) im = Image.new("RGB", (1, 1))
im.info["transparency"] = (255, 0, 0) im.info["transparency"] = (255, 0, 0)
self.assert_warning(UserWarning, im.save, out) pytest.warns(UserWarning, im.save, out)
with Image.open(out) as reloaded: with Image.open(out) as reloaded:
self.assertNotIn("transparency", reloaded.info) self.assertNotIn("transparency", reloaded.info)
@ -693,7 +694,7 @@ class TestFileGif(PillowTestCase):
im = Image.new("RGB", (1, 1)) im = Image.new("RGB", (1, 1))
im.info["transparency"] = b"" im.info["transparency"] = b""
ims = [Image.new("RGB", (1, 1))] ims = [Image.new("RGB", (1, 1))]
self.assert_warning(UserWarning, im.save, out, save_all=True, append_images=ims) pytest.warns(UserWarning, im.save, out, save_all=True, append_images=ims)
with Image.open(out) as reloaded: with Image.open(out) as reloaded:
self.assertNotIn("transparency", reloaded.info) self.assertNotIn("transparency", reloaded.info)

3
Tests/test_file_icns.py
View File

@ -2,6 +2,7 @@ import io
import sys import sys
import unittest import unittest
import pytest
from PIL import IcnsImagePlugin, Image from PIL import IcnsImagePlugin, Image
from .helper import PillowTestCase, assert_image_equal, assert_image_similar from .helper import PillowTestCase, assert_image_equal, assert_image_similar
@ -19,7 +20,7 @@ class TestFileIcns(PillowTestCase):
with Image.open(TEST_FILE) as im: with Image.open(TEST_FILE) as im:
# Assert that there is no unclosed file warning # Assert that there is no unclosed file warning
self.assert_warning(None, im.load) pytest.warns(None, im.load)
self.assertEqual(im.mode, "RGBA") self.assertEqual(im.mode, "RGBA")
self.assertEqual(im.size, (1024, 1024)) self.assertEqual(im.size, (1024, 1024))

3
Tests/test_file_ico.py
View File

@ -1,5 +1,6 @@
import io import io
import pytest
from PIL import IcoImagePlugin, Image, ImageDraw from PIL import IcoImagePlugin, Image, ImageDraw
from .helper import PillowTestCase, assert_image_equal, hopper from .helper import PillowTestCase, assert_image_equal, hopper
@ -87,7 +88,7 @@ class TestFileIco(PillowTestCase):
with Image.open("Tests/images/hopper_unexpected.ico") as im: with Image.open("Tests/images/hopper_unexpected.ico") as im:
self.assertEqual(im.size, (16, 16)) self.assertEqual(im.size, (16, 16))
self.assert_warning(UserWarning, open) pytest.warns(UserWarning, open)
def test_draw_reloaded(self): def test_draw_reloaded(self):
with Image.open(TEST_ICO_FILE) as im: with Image.open(TEST_ICO_FILE) as im:

7
Tests/test_file_im.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import Image, ImImagePlugin from PIL import Image, ImImagePlugin
from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy
@ -22,7 +23,7 @@ class TestFileIm(PillowTestCase):
im = Image.open(TEST_IM) im = Image.open(TEST_IM)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -30,14 +31,14 @@ class TestFileIm(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(TEST_IM) as im: with Image.open(TEST_IM) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_tell(self): def test_tell(self):
# Arrange # Arrange

3
Tests/test_file_jpeg.py
View File

@ -1,6 +1,7 @@
import os import os
from io import BytesIO from io import BytesIO
import pytest
from PIL import Image, ImageFile, JpegImagePlugin from PIL import Image, ImageFile, JpegImagePlugin
from .helper import ( from .helper import (
@ -531,7 +532,7 @@ class TestFileJpeg(PillowTestCase):
# Act # Act
# Shouldn't raise error # Shouldn't raise error
fn = "Tests/images/sugarshack_bad_mpo_header.jpg" fn = "Tests/images/sugarshack_bad_mpo_header.jpg"
with self.assert_warning(UserWarning, Image.open, fn) as im: with pytest.warns(UserWarning, Image.open, fn) as im:
# Assert # Assert
self.assertEqual(im.format, "JPEG") self.assertEqual(im.format, "JPEG")

7
Tests/test_file_mpo.py
View File

@ -1,6 +1,7 @@
import unittest import unittest
from io import BytesIO from io import BytesIO
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, assert_image_similar, is_pypy from .helper import PillowTestCase, assert_image_similar, is_pypy
@ -38,7 +39,7 @@ class TestFileMpo(PillowTestCase):
im = Image.open(test_files[0]) im = Image.open(test_files[0])
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -46,14 +47,14 @@ class TestFileMpo(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(test_files[0]) as im: with Image.open(test_files[0]) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_app(self): def test_app(self):
for test_file in test_files: for test_file in test_files:

2
Tests/test_file_png.py
View File

@ -338,7 +338,7 @@ class TestFilePng(PillowTestCase):
with Image.open(TEST_PNG_FILE) as im: with Image.open(TEST_PNG_FILE) as im:
# Assert that there is no unclosed file warning # Assert that there is no unclosed file warning
self.assert_warning(None, im.verify) pytest.warns(None, im.verify)
with Image.open(TEST_PNG_FILE) as im: with Image.open(TEST_PNG_FILE) as im:
im.load() im.load()

7
Tests/test_file_psd.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import Image, PsdImagePlugin from PIL import Image, PsdImagePlugin
from .helper import PillowTestCase, assert_image_similar, hopper, is_pypy from .helper import PillowTestCase, assert_image_similar, hopper, is_pypy
@ -24,7 +25,7 @@ class TestImagePsd(PillowTestCase):
im = Image.open(test_file) im = Image.open(test_file)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -32,14 +33,14 @@ class TestImagePsd(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(test_file) as im: with Image.open(test_file) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_invalid_file(self): def test_invalid_file(self):
invalid_file = "Tests/images/flower.jpg" invalid_file = "Tests/images/flower.jpg"

7
Tests/test_file_spider.py
View File

@ -2,6 +2,7 @@ import tempfile
import unittest import unittest
from io import BytesIO from io import BytesIO
import pytest
from PIL import Image, ImageSequence, SpiderImagePlugin from PIL import Image, ImageSequence, SpiderImagePlugin
from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy from .helper import PillowTestCase, assert_image_equal, hopper, is_pypy
@ -23,7 +24,7 @@ class TestImageSpider(PillowTestCase):
im = Image.open(TEST_FILE) im = Image.open(TEST_FILE)
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -31,14 +32,14 @@ class TestImageSpider(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open(TEST_FILE) as im: with Image.open(TEST_FILE) as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_save(self): def test_save(self):
# Arrange # Arrange

7
Tests/test_file_tar.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import Image, TarIO from PIL import Image, TarIO
from .helper import PillowTestCase, is_pypy from .helper import PillowTestCase, is_pypy
@ -33,18 +34,18 @@ class TestFileTar(PillowTestCase):
def open(): def open():
TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg") TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_close(self): def test_close(self):
def open(): def open():
tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg") tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
tar.close() tar.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_contextmanager(self): def test_contextmanager(self):
def open(): def open():
with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"): with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"):
pass pass
self.assert_warning(None, open) pytest.warns(None, open)

3
Tests/test_file_tga.py
View File

@ -2,6 +2,7 @@ import os
from glob import glob from glob import glob
from itertools import product from itertools import product
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, assert_image_equal, hopper from .helper import PillowTestCase, assert_image_equal, hopper
@ -136,7 +137,7 @@ class TestFileTga(PillowTestCase):
# Save with custom id section greater than 255 characters # Save with custom id section greater than 255 characters
id_section = b"Test content" * 25 id_section = b"Test content" * 25
self.assert_warning(UserWarning, lambda: im.save(out, id_section=id_section)) pytest.warns(UserWarning, lambda: im.save(out, id_section=id_section))
with Image.open(out) as test_im: with Image.open(out) as test_im:
self.assertEqual(test_im.info["id_section"], id_section[:255]) self.assertEqual(test_im.info["id_section"], id_section[:255])

8
Tests/test_file_tiff.py
View File

@ -60,7 +60,7 @@ class TestFileTiff(PillowTestCase):
im = Image.open("Tests/images/multipage.tiff") im = Image.open("Tests/images/multipage.tiff")
im.load() im.load()
self.assert_warning(ResourceWarning, open) pytest.warns(ResourceWarning, open)
def test_closed_file(self): def test_closed_file(self):
def open(): def open():
@ -68,14 +68,14 @@ class TestFileTiff(PillowTestCase):
im.load() im.load()
im.close() im.close()
self.assert_warning(None, open) pytest.warns(None, open)
def test_context_manager(self): def test_context_manager(self):
def open(): def open():
with Image.open("Tests/images/multipage.tiff") as im: with Image.open("Tests/images/multipage.tiff") as im:
im.load() im.load()
self.assert_warning(None, open) pytest.warns(None, open)
def test_mac_tiff(self): def test_mac_tiff(self):
# Read RGBa images from macOS [@PIL136] # Read RGBa images from macOS [@PIL136]
@ -185,7 +185,7 @@ class TestFileTiff(PillowTestCase):
def test_bad_exif(self): def test_bad_exif(self):
with Image.open("Tests/images/hopper_bad_exif.jpg") as i: with Image.open("Tests/images/hopper_bad_exif.jpg") as i:
# Should not raise struct.error. # Should not raise struct.error.
self.assert_warning(UserWarning, i._getexif) pytest.warns(UserWarning, i._getexif)
def test_save_rgba(self): def test_save_rgba(self):
im = hopper("RGBA") im = hopper("RGBA")

5
Tests/test_file_tiff_metadata.py
View File

@ -1,6 +1,7 @@
import io import io
import struct import struct
import pytest
from PIL import Image, TiffImagePlugin, TiffTags from PIL import Image, TiffImagePlugin, TiffTags
from PIL.TiffImagePlugin import IFDRational from PIL.TiffImagePlugin import IFDRational
@ -174,7 +175,7 @@ class TestFileTiffMetadata(PillowTestCase):
head = f.read(8) head = f.read(8)
info = TiffImagePlugin.ImageFileDirectory(head) info = TiffImagePlugin.ImageFileDirectory(head)
# Should not raise struct.error. # Should not raise struct.error.
self.assert_warning(UserWarning, info.load, f) pytest.warns(UserWarning, info.load, f)
def test_iccprofile(self): def test_iccprofile(self):
# https://github.com/python-pillow/Pillow/issues/1462 # https://github.com/python-pillow/Pillow/issues/1462
@ -333,4 +334,4 @@ class TestFileTiffMetadata(PillowTestCase):
ifd.tagtype[277] = TiffTags.SHORT ifd.tagtype[277] = TiffTags.SHORT
# Should not raise ValueError. # Should not raise ValueError.
self.assert_warning(UserWarning, lambda: ifd[277]) pytest.warns(UserWarning, lambda: ifd[277])

5
Tests/test_file_webp.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import Image, WebPImagePlugin from PIL import Image, WebPImagePlugin
from .helper import ( from .helper import (
@ -23,7 +24,7 @@ class TestUnsupportedWebp(PillowTestCase):
WebPImagePlugin.SUPPORTED = False WebPImagePlugin.SUPPORTED = False
file_path = "Tests/images/hopper.webp" file_path = "Tests/images/hopper.webp"
self.assert_warning( pytest.warns(
UserWarning, lambda: self.assertRaises(IOError, Image.open, file_path) UserWarning, lambda: self.assertRaises(IOError, Image.open, file_path)
) )
@ -146,7 +147,7 @@ class TestFileWebp(PillowTestCase):
file_path = "Tests/images/hopper.webp" file_path = "Tests/images/hopper.webp"
with Image.open(file_path) as image: with Image.open(file_path) as image:
temp_file = self.tempfile("temp.webp") temp_file = self.tempfile("temp.webp")
self.assert_warning(None, image.save, temp_file) pytest.warns(None, image.save, temp_file)
def test_file_pointer_could_be_reused(self): def test_file_pointer_could_be_reused(self):
file_path = "Tests/images/hopper.webp" file_path = "Tests/images/hopper.webp"

3
Tests/test_image.py
View File

@ -4,6 +4,7 @@ import shutil
import tempfile import tempfile
import unittest import unittest
import pytest
from PIL import Image, UnidentifiedImageError from PIL import Image, UnidentifiedImageError
from .helper import ( from .helper import (
@ -576,7 +577,7 @@ class TestImage(PillowTestCase):
# Act/Assert # Act/Assert
with Image.open(test_file) as im: with Image.open(test_file) as im:
self.assert_warning(None, im.save, temp_file) pytest.warns(None, im.save, temp_file)
def test_load_on_nonexclusive_multiframe(self): def test_load_on_nonexclusive_multiframe(self):
with open("Tests/images/frozenpond.mpo", "rb") as fp: with open("Tests/images/frozenpond.mpo", "rb") as fp:

5
Tests/test_image_convert.py
View File

@ -1,3 +1,4 @@
import pytest
from PIL import Image from PIL import Image
from .helper import ( from .helper import (
@ -122,7 +123,7 @@ class TestImageConvert(PillowTestCase):
self.assertIn("transparency", im_p.info) self.assertIn("transparency", im_p.info)
im_p.save(f) im_p.save(f)
im_p = self.assert_warning(UserWarning, im.convert, "P", palette=Image.ADAPTIVE) im_p = pytest.warns(UserWarning, im.convert, "P", palette=Image.ADAPTIVE)
self.assertNotIn("transparency", im_p.info) self.assertNotIn("transparency", im_p.info)
im_p.save(f) im_p.save(f)
@ -144,7 +145,7 @@ class TestImageConvert(PillowTestCase):
self.assertNotIn("transparency", im_rgba.info) self.assertNotIn("transparency", im_rgba.info)
im_rgba.save(f) im_rgba.save(f)
im_p = self.assert_warning(UserWarning, im.convert, "P", palette=Image.ADAPTIVE) im_p = pytest.warns(UserWarning, im.convert, "P", palette=Image.ADAPTIVE)
self.assertNotIn("transparency", im_p.info) self.assertNotIn("transparency", im_p.info)
im_p.save(f) im_p.save(f)

3
Tests/test_imagecms.py
View File

@ -2,6 +2,7 @@ import datetime
import os import os
from io import BytesIO from io import BytesIO
import pytest
from PIL import Image, ImageMode from PIL import Image, ImageMode
from .helper import ( from .helper import (
@ -447,7 +448,7 @@ class TestImageCms(PillowTestCase):
p = o.profile p = o.profile
def helper_deprecated(attr, expected): def helper_deprecated(attr, expected):
result = self.assert_warning(DeprecationWarning, getattr, p, attr) result = pytest.warns(DeprecationWarning, getattr, p, attr)
self.assertEqual(result, expected) self.assertEqual(result, expected)
# p.color_space # p.color_space

3
Tests/test_numpy.py
View File

@ -1,5 +1,6 @@
import unittest import unittest
import pytest
from PIL import Image from PIL import Image
from .helper import PillowTestCase, assert_deep_equal, assert_image, hopper from .helper import PillowTestCase, assert_deep_equal, assert_image, hopper
@ -220,4 +221,4 @@ class TestNumpy(PillowTestCase):
with Image.open(test_file) as im: with Image.open(test_file) as im:
# Act/Assert # Act/Assert
self.assert_warning(None, lambda: array(im)) pytest.warns(None, lambda: array(im))