Replace 'assert False' with pytest.fail()

This commit is contained in:
Hugo van Kemenade 2023-11-12 22:30:28 +02:00
parent 556dd1e15c
commit 5eea6ed633
7 changed files with 13 additions and 11 deletions

View File

@ -95,7 +95,7 @@ def assert_image_equal(a, b, msg=None):
except Exception:
pass
assert False, msg or "got different content"
pytest.fail(msg or "got different content")
def assert_image_equal_tofile(a, filename, msg=None, mode=None):

View File

@ -1,6 +1,8 @@
import sys
from io import BytesIO, StringIO
import pytest
from PIL import Image, IptcImagePlugin
from .helper import hopper
@ -44,7 +46,7 @@ def test_getiptcinfo_fotostation():
for tag in iptc.keys():
if tag[0] == 240:
return
assert False, "FotoStation tag not found"
pytest.fail("FotoStation tag not found")
def test_getiptcinfo_zero_padding():

View File

@ -416,7 +416,7 @@ def test_plt_marker():
while True:
marker = out.read(2)
if not marker:
assert False, "End of stream without PLT"
pytest.fail("End of stream without PLT")
jp2_boxid = _binary.i16be(marker)
if jp2_boxid == 0xFF4F:
@ -426,7 +426,7 @@ def test_plt_marker():
# PLT
return
elif jp2_boxid == 0xFF93:
assert False, "SOD without finding PLT first"
pytest.fail("SOD without finding PLT first")
hdr = out.read(2)
length = _binary.i16be(hdr)

View File

@ -999,7 +999,7 @@ class TestImage:
with Image.open(os.path.join("Tests/images", path)) as im:
try:
im.load()
assert False
pytest.fail()
except OSError as e:
buffer_overrun = str(e) == "buffer overrun when reading image file"
truncated = "image file is truncated" in str(e)
@ -1010,7 +1010,7 @@ class TestImage:
with Image.open("Tests/images/fli_overrun2.bin") as im:
try:
im.seek(1)
assert False
pytest.fail()
except OSError as e:
assert str(e) == "buffer overrun when reading image file"

View File

@ -195,7 +195,7 @@ class TestReducingGapResize:
(52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=1.0
)
with pytest.raises(AssertionError):
with pytest.raises(pytest.fail.Exception):
assert_image_equal(ref, im)
assert_image_similar(ref, im, epsilon)
@ -210,7 +210,7 @@ class TestReducingGapResize:
(52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=2.0
)
with pytest.raises(AssertionError):
with pytest.raises(pytest.fail.Exception):
assert_image_equal(ref, im)
assert_image_similar(ref, im, epsilon)
@ -225,7 +225,7 @@ class TestReducingGapResize:
(52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=3.0
)
with pytest.raises(AssertionError):
with pytest.raises(pytest.fail.Exception):
assert_image_equal(ref, im)
assert_image_similar(ref, im, epsilon)

View File

@ -147,7 +147,7 @@ def test_reducing_gap_values():
ref = hopper()
ref.thumbnail((18, 18), Image.Resampling.BICUBIC, reducing_gap=None)
with pytest.raises(AssertionError):
with pytest.raises(pytest.fail.Exception):
assert_image_equal(ref, im)
assert_image_similar(ref, im, 3.5)

View File

@ -85,7 +85,7 @@ def test_ipythonviewer():
test_viewer = viewer
break
else:
assert False
pytest.fail()
im = hopper()
assert test_viewer.show(im) == 1