From 5eea6ed6334d5cf37f378fe20d2310f0cb1c16f5 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sun, 12 Nov 2023 22:30:28 +0200
Subject: [PATCH] Replace 'assert False' with pytest.fail()

---
 Tests/helper.py               | 2 +-
 Tests/test_file_iptc.py       | 4 +++-
 Tests/test_file_jpeg2k.py     | 4 ++--
 Tests/test_image.py           | 4 ++--
 Tests/test_image_resize.py    | 6 +++---
 Tests/test_image_thumbnail.py | 2 +-
 Tests/test_imageshow.py       | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Tests/helper.py b/Tests/helper.py
index de5468d84..aacd95564 100644
--- a/Tests/helper.py
+++ b/Tests/helper.py
@@ -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):
diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py
index d2edcfc27..dac35a8d0 100644
--- a/Tests/test_file_iptc.py
+++ b/Tests/test_file_iptc.py
@@ -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():
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index 99df26fc9..2016b3ccb 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -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)
diff --git a/Tests/test_image.py b/Tests/test_image.py
index 039eb33d1..9efd4c467 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -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"
 
diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py
index 83c54cf62..b5bfa903f 100644
--- a/Tests/test_image_resize.py
+++ b/Tests/test_image_resize.py
@@ -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)
diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py
index 4fd07a2b4..96a2c2662 100644
--- a/Tests/test_image_thumbnail.py
+++ b/Tests/test_image_thumbnail.py
@@ -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)
diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index e54372b60..3e73339ed 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -85,7 +85,7 @@ def test_ipythonviewer():
             test_viewer = viewer
             break
     else:
-        assert False
+        pytest.fail()
 
     im = hopper()
     assert test_viewer.show(im) == 1