From 3495b319bdb381319421aba17931ca9b584654ac Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 21 Feb 2021 22:22:29 +1100
Subject: [PATCH] Replaced various instances of assert_image_similar with
 assert_image_similar_tofile

---
 Tests/test_file_eps.py          | 12 ++++--
 Tests/test_file_icns.py         |  5 +--
 Tests/test_file_jpeg.py         |  5 ++-
 Tests/test_file_jpeg2k.py       | 17 +++-----
 Tests/test_file_libtiff.py      |  6 +--
 Tests/test_file_webp_alpha.py   | 10 +++--
 Tests/test_file_wmf.py          | 13 ++----
 Tests/test_font_pcf.py          |  8 ++--
 Tests/test_font_pcf_charsets.py |  5 +--
 Tests/test_image.py             |  8 ++--
 Tests/test_imagecms.py          | 11 +++--
 Tests/test_imagedraw2.py        | 10 ++---
 Tests/test_imagefont.py         | 76 ++++++++++++---------------------
 Tests/test_imagefontctl.py      | 53 ++++++++---------------
 Tests/test_imageops.py          |  8 ++--
 15 files changed, 105 insertions(+), 142 deletions(-)

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 1e56498ba72..ea91375dadb 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -4,7 +4,12 @@
 
 from PIL import EpsImagePlugin, Image, features
 
-from .helper import assert_image_similar, hopper, skip_unless_feature
+from .helper import (
+    assert_image_similar,
+    assert_image_similar_tofile,
+    hopper,
+    skip_unless_feature,
+)
 
 HAS_GHOSTSCRIPT = EpsImagePlugin.has_ghostscript()
 
@@ -72,8 +77,9 @@ def test_cmyk():
         assert cmyk_image.mode == "RGB"
 
         if features.check("jpg"):
-            with Image.open("Tests/images/pil_sample_rgb.jpg") as target:
-                assert_image_similar(cmyk_image, target, 10)
+            assert_image_similar_tofile(
+                cmyk_image, "Tests/images/pil_sample_rgb.jpg", 10
+            )
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py
index 37898d0bdf8..fef2329bc5a 100644
--- a/Tests/test_file_icns.py
+++ b/Tests/test_file_icns.py
@@ -5,7 +5,7 @@
 
 from PIL import IcnsImagePlugin, Image, features
 
-from .helper import assert_image_equal, assert_image_similar
+from .helper import assert_image_equal, assert_image_similar_tofile
 
 # sample icon file
 TEST_FILE = "Tests/images/pillow.icns"
@@ -49,8 +49,7 @@ def test_save_append_images(tmp_path):
     with Image.open(TEST_FILE) as im:
         im.save(temp_file, append_images=[provided_im])
 
-        with Image.open(temp_file) as reread:
-            assert_image_similar(reread, im, 1)
+        assert_image_similar_tofile(im, temp_file, 1)
 
         with Image.open(temp_file) as reread:
             reread.size = (16, 16, 2)
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 0dabd98f875..740f9fa4d73 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -19,6 +19,7 @@
     assert_image_equal,
     assert_image_equal_tofile,
     assert_image_similar,
+    assert_image_similar_tofile,
     cjpeg_available,
     djpeg_available,
     hopper,
@@ -578,7 +579,7 @@ def test_save_low_quality_baseline_qtables(self):
     def test_load_djpeg(self):
         with Image.open(TEST_FILE) as img:
             img.load_djpeg()
-            assert_image_similar(img, Image.open(TEST_FILE), 5)
+            assert_image_similar_tofile(img, TEST_FILE, 5)
 
     @pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available")
     def test_save_cjpeg(self, tmp_path):
@@ -586,7 +587,7 @@ def test_save_cjpeg(self, tmp_path):
             tempfile = str(tmp_path / "temp.jpg")
             JpegImagePlugin._save_cjpeg(img, 0, tempfile)
             # Default save quality is 75%, so a tiny bit of difference is alright
-            assert_image_similar(img, Image.open(tempfile), 17)
+            assert_image_similar_tofile(img, tempfile, 17)
 
     def test_no_duplicate_0x1001_tag(self):
         # Arrange
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index e22cff087b6..13ae09af59f 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -8,6 +8,7 @@
 from .helper import (
     assert_image_equal,
     assert_image_similar,
+    assert_image_similar_tofile,
     is_big_endian,
     skip_unless_feature,
 )
@@ -62,9 +63,7 @@ def test_invalid_file():
 def test_bytesio():
     with open("Tests/images/test-card-lossless.jp2", "rb") as f:
         data = BytesIO(f.read())
-    with Image.open(data) as im:
-        im.load()
-        assert_image_similar(im, test_card, 1.0e-3)
+    assert_image_similar_tofile(test_card, data, 1.0e-3)
 
 
 # These two test pre-written JPEG 2000 files that were not written with
@@ -80,9 +79,9 @@ def test_lossless(tmp_path):
 
 
 def test_lossy_tiled():
-    with Image.open("Tests/images/test-card-lossy-tiled.jp2") as im:
-        im.load()
-        assert_image_similar(im, test_card, 2.0)
+    assert_image_similar_tofile(
+        test_card, "Tests/images/test-card-lossy-tiled.jp2", 2.0
+    )
 
 
 def test_lossless_rt():
@@ -193,15 +192,13 @@ def test_16bit_monochrome_has_correct_mode():
 @pytest.mark.xfail(is_big_endian(), reason="Fails on big-endian")
 def test_16bit_monochrome_jp2_like_tiff():
     with Image.open("Tests/images/16bit.cropped.tif") as tiff_16bit:
-        with Image.open("Tests/images/16bit.cropped.jp2") as jp2:
-            assert_image_similar(jp2, tiff_16bit, 1e-3)
+        assert_image_similar_tofile(tiff_16bit, "Tests/images/16bit.cropped.jp2", 1e-3)
 
 
 @pytest.mark.xfail(is_big_endian(), reason="Fails on big-endian")
 def test_16bit_monochrome_j2k_like_tiff():
     with Image.open("Tests/images/16bit.cropped.tif") as tiff_16bit:
-        with Image.open("Tests/images/16bit.cropped.j2k") as j2k:
-            assert_image_similar(j2k, tiff_16bit, 1e-3)
+        assert_image_similar_tofile(tiff_16bit, "Tests/images/16bit.cropped.j2k", 1e-3)
 
 
 def test_16bit_j2k_roundtrips():
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index c1eb7fb7466..7a5a5b46288 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -457,8 +457,7 @@ def test_compressions(self, tmp_path):
 
         im.save(out, compression="jpeg", quality=30)
         size_jpeg_30 = os.path.getsize(out)
-        with Image.open(out) as im3:
-            assert_image_similar(im2, im3, 30)
+        assert_image_similar_tofile(im2, out, 30)
 
         assert size_raw > size_compressed
         assert size_compressed > size_jpeg
@@ -642,8 +641,7 @@ def save_bytesio(compression=None):
             pilim.save(buffer_io, format="tiff", compression=compression)
             buffer_io.seek(0)
 
-            with Image.open(buffer_io) as pilim_load:
-                assert_image_similar(pilim, pilim_load, 0)
+            assert_image_similar_tofile(pilim, buffer_io, 0)
 
         save_bytesio()
         save_bytesio("raw")
diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py
index 362edac1a25..dc82fb742b2 100644
--- a/Tests/test_file_webp_alpha.py
+++ b/Tests/test_file_webp_alpha.py
@@ -2,7 +2,12 @@
 
 from PIL import Image
 
-from .helper import assert_image_equal, assert_image_similar, hopper
+from .helper import (
+    assert_image_equal,
+    assert_image_similar,
+    assert_image_similar_tofile,
+    hopper,
+)
 
 _webp = pytest.importorskip("PIL._webp", reason="WebP support not installed")
 
@@ -29,8 +34,7 @@ def test_read_rgba():
 
         image.tobytes()
 
-        with Image.open("Tests/images/transparent.png") as target:
-            assert_image_similar(image, target, 20.0)
+        assert_image_similar_tofile(image, "Tests/images/transparent.png", 20.0)
 
 
 def test_write_lossless_rgb(tmp_path):
diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
index d18225680dd..bf9d105e53f 100644
--- a/Tests/test_file_wmf.py
+++ b/Tests/test_file_wmf.py
@@ -2,7 +2,7 @@
 
 from PIL import Image, WmfImagePlugin
 
-from .helper import assert_image_similar, hopper
+from .helper import assert_image_similar_tofile, hopper
 
 
 def test_load_raw():
@@ -13,9 +13,7 @@ def test_load_raw():
             # Currently, support for WMF/EMF is Windows-only
             im.load()
             # Compare to reference rendering
-            with Image.open("Tests/images/drawing_emf_ref.png") as imref:
-                imref.load()
-                assert_image_similar(im, imref, 0)
+            assert_image_similar_tofile(im, "Tests/images/drawing_emf_ref.png", 0)
 
     # Test basic WMF open and rendering
     with Image.open("Tests/images/drawing.wmf") as im:
@@ -23,9 +21,7 @@ def test_load_raw():
             # Currently, support for WMF/EMF is Windows-only
             im.load()
             # Compare to reference rendering
-            with Image.open("Tests/images/drawing_wmf_ref.png") as imref:
-                imref.load()
-                assert_image_similar(im, imref, 2.0)
+            assert_image_similar_tofile(im, "Tests/images/drawing_wmf_ref.png", 2.0)
 
 
 def test_register_handler(tmp_path):
@@ -66,8 +62,7 @@ def test_load_set_dpi():
             im.load(144)
             assert im.size == (164, 164)
 
-            with Image.open("Tests/images/drawing_wmf_ref_144.png") as expected:
-                assert_image_similar(im, expected, 2.1)
+            assert_image_similar_tofile(im, "Tests/images/drawing_wmf_ref_144.png", 2.1)
 
 
 def test_save(tmp_path):
diff --git a/Tests/test_font_pcf.py b/Tests/test_font_pcf.py
index 4814a85611c..288848f2619 100644
--- a/Tests/test_font_pcf.py
+++ b/Tests/test_font_pcf.py
@@ -6,7 +6,7 @@
 
 from .helper import (
     assert_image_equal_tofile,
-    assert_image_similar,
+    assert_image_similar_tofile,
     skip_unless_feature,
 )
 
@@ -61,8 +61,7 @@ def test_draw(request, tmp_path):
     im = Image.new("L", (130, 30), "white")
     draw = ImageDraw.Draw(im)
     draw.text((0, 0), message, "black", font=font)
-    with Image.open("Tests/images/test_draw_pbm_target.png") as target:
-        assert_image_similar(im, target, 0)
+    assert_image_similar_tofile(im, "Tests/images/test_draw_pbm_target.png", 0)
 
 
 def test_textsize(request, tmp_path):
@@ -83,8 +82,7 @@ def _test_high_characters(request, tmp_path, message):
     im = Image.new("L", (750, 30), "white")
     draw = ImageDraw.Draw(im)
     draw.text((0, 0), message, "black", font=font)
-    with Image.open("Tests/images/high_ascii_chars.png") as target:
-        assert_image_similar(im, target, 0)
+    assert_image_similar_tofile(im, "Tests/images/high_ascii_chars.png", 0)
 
 
 def test_high_characters(request, tmp_path):
diff --git a/Tests/test_font_pcf_charsets.py b/Tests/test_font_pcf_charsets.py
index 4ada6b51be4..a1036fd28e6 100644
--- a/Tests/test_font_pcf_charsets.py
+++ b/Tests/test_font_pcf_charsets.py
@@ -4,7 +4,7 @@
 
 from .helper import (
     assert_image_equal_tofile,
-    assert_image_similar,
+    assert_image_similar_tofile,
     skip_unless_feature,
 )
 
@@ -82,8 +82,7 @@ def _test_draw(request, tmp_path, encoding):
     draw = ImageDraw.Draw(im)
     message = charsets[encoding]["message"].encode(encoding)
     draw.text((0, 0), message, "black", font=font)
-    with Image.open(charsets[encoding]["image1"]) as target:
-        assert_image_similar(im, target, 0)
+    assert_image_similar_tofile(im, charsets[encoding]["image1"], 0)
 
 
 def test_draw_iso8859_1(request, tmp_path):
diff --git a/Tests/test_image.py b/Tests/test_image.py
index e9780b84636..73cf7bf8350 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -11,7 +11,7 @@
 from .helper import (
     assert_image_equal,
     assert_image_equal_tofile,
-    assert_image_similar,
+    assert_image_similar_tofile,
     assert_not_all_same,
     hopper,
     is_win32,
@@ -172,8 +172,7 @@ def test_tempfile(self):
         with tempfile.TemporaryFile() as fp:
             im.save(fp, "JPEG")
             fp.seek(0)
-            with Image.open(fp) as reloaded:
-                assert_image_similar(im, reloaded, 20)
+            assert_image_similar_tofile(im, fp, 20)
 
     def test_unknown_extension(self, tmp_path):
         im = hopper()
@@ -456,8 +455,7 @@ def test_effect_spread(self):
 
         # Assert
         assert im.size == (128, 128)
-        with Image.open("Tests/images/effect_spread.png") as im3:
-            assert_image_similar(im2, im3, 110)
+        assert_image_similar_tofile(im2, "Tests/images/effect_spread.png", 110)
 
     def test_effect_spread_zero(self):
         # Arrange
diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py
index 9fab4174675..99f3b4e0329 100644
--- a/Tests/test_imagecms.py
+++ b/Tests/test_imagecms.py
@@ -8,7 +8,13 @@
 
 from PIL import Image, ImageMode, features
 
-from .helper import assert_image, assert_image_equal, assert_image_similar, hopper
+from .helper import (
+    assert_image,
+    assert_image_equal,
+    assert_image_similar,
+    assert_image_similar_tofile,
+    hopper,
+)
 
 try:
     from PIL import ImageCms
@@ -240,8 +246,7 @@ def test_lab_color():
 
     # i.save('temp.lab.tif')  # visually verified vs PS.
 
-    with Image.open("Tests/images/hopper.Lab.tif") as target:
-        assert_image_similar(i, target, 3.5)
+    assert_image_similar_tofile(i, "Tests/images/hopper.Lab.tif", 3.5)
 
 
 def test_lab_srgb():
diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py
index 2023ba332d6..3a70176cee5 100644
--- a/Tests/test_imagedraw2.py
+++ b/Tests/test_imagedraw2.py
@@ -5,7 +5,7 @@
 from .helper import (
     assert_image_equal,
     assert_image_equal_tofile,
-    assert_image_similar,
+    assert_image_similar_tofile,
     hopper,
     skip_unless_feature,
 )
@@ -62,7 +62,7 @@ def helper_ellipse(mode, bbox):
     draw.ellipse(bbox, pen, brush)
 
     # Assert
-    assert_image_similar(im, Image.open(expected), 1)
+    assert_image_similar_tofile(im, expected, 1)
 
 
 def test_ellipse1():
@@ -83,7 +83,7 @@ def test_ellipse_edge():
     draw.ellipse(((0, 0), (W - 1, H - 1)), brush)
 
     # Assert
-    assert_image_similar(im, Image.open("Tests/images/imagedraw_ellipse_edge.png"), 1)
+    assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_edge.png", 1)
 
 
 def helper_line(points):
@@ -179,7 +179,7 @@ def test_big_rectangle():
     draw.rectangle(bbox, brush)
 
     # Assert
-    assert_image_similar(im, Image.open(expected), 1)
+    assert_image_similar_tofile(im, expected, 1)
 
 
 @skip_unless_feature("freetype2")
@@ -194,7 +194,7 @@ def test_text():
     draw.text((5, 5), "ImageDraw2", font)
 
     # Assert
-    assert_image_similar(im, Image.open(expected), 13)
+    assert_image_similar_tofile(im, expected, 13)
 
 
 @skip_unless_feature("freetype2")
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index b67adc60fc5..5d611a27faf 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -13,7 +13,6 @@
 from .helper import (
     assert_image_equal,
     assert_image_equal_tofile,
-    assert_image_similar,
     assert_image_similar_tofile,
     is_win32,
     skip_unless_feature,
@@ -130,8 +129,7 @@ def test_transparent_background(self):
         draw.text((10, 10), txt, font=ttf)
 
         target = "Tests/images/transparent_background_text.png"
-        with Image.open(target) as target_img:
-            assert_image_similar(im, target_img, 4.09)
+        assert_image_similar_tofile(im, target, 4.09)
 
     def test_textsize_equal(self):
         im = Image.new(mode="RGB", size=(300, 100))
@@ -143,11 +141,10 @@ def test_textsize_equal(self):
         draw.text((10, 10), txt, font=ttf)
         draw.rectangle((10, 10, 10 + size[0], 10 + size[1]))
 
-        target = "Tests/images/rectangle_surrounding_text.png"
-        with Image.open(target) as target_img:
-
-            # Epsilon ~.5 fails with FreeType 2.7
-            assert_image_similar(im, target_img, 2.5)
+        # Epsilon ~.5 fails with FreeType 2.7
+        assert_image_similar_tofile(
+            im, "Tests/images/rectangle_surrounding_text.png", 2.5
+        )
 
     @pytest.mark.parametrize(
         "text, mode, font, size, length_basic, length_raqm",
@@ -191,13 +188,10 @@ def test_render_multiline(self):
             draw.text((0, y), line, font=ttf)
             y += line_spacing
 
-        target = "Tests/images/multiline_text.png"
-        with Image.open(target) as target_img:
-
-            # some versions of freetype have different horizontal spacing.
-            # setting a tight epsilon, I'm showing the original test failure
-            # at epsilon = ~38.
-            assert_image_similar(im, target_img, 6.2)
+        # some versions of freetype have different horizontal spacing.
+        # setting a tight epsilon, I'm showing the original test failure
+        # at epsilon = ~38.
+        assert_image_similar_tofile(im, "Tests/images/multiline_text.png", 6.2)
 
     def test_render_multiline_text(self):
         ttf = self.get_font()
@@ -208,11 +202,8 @@ def test_render_multiline_text(self):
         draw = ImageDraw.Draw(im)
         draw.text((0, 0), TEST_TEXT, font=ttf)
 
-        target = "Tests/images/multiline_text.png"
-        with Image.open(target) as target_img:
-
-            # Epsilon ~.5 fails with FreeType 2.7
-            assert_image_similar(im, target_img, 6.2)
+        # Epsilon ~.5 fails with FreeType 2.7
+        assert_image_similar_tofile(im, "Tests/images/multiline_text.png", 6.2)
 
         # Test that text() can pass on additional arguments
         # to multiline_text()
@@ -227,11 +218,10 @@ def test_render_multiline_text(self):
             draw = ImageDraw.Draw(im)
             draw.multiline_text((0, 0), TEST_TEXT, font=ttf, align=align)
 
-            target = "Tests/images/multiline_text" + ext + ".png"
-            with Image.open(target) as target_img:
-
-                # Epsilon ~.5 fails with FreeType 2.7
-                assert_image_similar(im, target_img, 6.2)
+            # Epsilon ~.5 fails with FreeType 2.7
+            assert_image_similar_tofile(
+                im, "Tests/images/multiline_text" + ext + ".png", 6.2
+            )
 
     def test_unknown_align(self):
         im = Image.new(mode="RGB", size=(300, 100))
@@ -285,11 +275,8 @@ def test_multiline_spacing(self):
         draw = ImageDraw.Draw(im)
         draw.multiline_text((0, 0), TEST_TEXT, font=ttf, spacing=10)
 
-        target = "Tests/images/multiline_text_spacing.png"
-        with Image.open(target) as target_img:
-
-            # Epsilon ~.5 fails with FreeType 2.7
-            assert_image_similar(im, target_img, 6.2)
+        # Epsilon ~.5 fails with FreeType 2.7
+        assert_image_similar_tofile(im, "Tests/images/multiline_text_spacing.png", 6.2)
 
     def test_rotated_transposed_font(self):
         img_grey = Image.new("L", (100, 100))
@@ -677,13 +664,11 @@ def _check_text(self, font, path, epsilon):
         d.text((10, 10), "Text", font=font, fill="black")
 
         try:
-            with Image.open(path) as expected:
-                assert_image_similar(im, expected, epsilon)
+            assert_image_similar_tofile(im, path, epsilon)
         except AssertionError:
             if "_adobe" in path:
                 path = path.replace("_adobe", "_adobe_older_harfbuzz")
-                with Image.open(path) as expected:
-                    assert_image_similar(im, expected, epsilon)
+                assert_image_similar_tofile(im, path, epsilon)
             else:
                 raise
 
@@ -774,8 +759,7 @@ def test_anchor(self, anchor, left, left_old, top):
 
         assert d.textbbox((0, 0), text, f, anchor=anchor) == bbox_expected
 
-        with Image.open(path) as expected:
-            assert_image_similar(im, expected, 7)
+        assert_image_similar_tofile(im, path, 7)
 
     @pytest.mark.parametrize(
         "anchor, align",
@@ -813,8 +797,7 @@ def test_anchor_multiline(self, anchor, align):
             (300, 200), text, fill="black", anchor=anchor, font=f, align=align
         )
 
-        with Image.open(target) as expected:
-            assert_image_similar(im, expected, 4)
+        assert_image_similar_tofile(im, target, 4)
 
     def test_anchor_invalid(self):
         font = self.get_font()
@@ -872,8 +855,7 @@ def test_standard_embedded_color(self):
         d = ImageDraw.Draw(im)
         d.text((10, 10), txt, font=ttf, fill="#fa6", embedded_color=True)
 
-        with Image.open("Tests/images/standard_embedded.png") as expected:
-            assert_image_similar(im, expected, 6.2)
+        assert_image_similar_tofile(im, "Tests/images/standard_embedded.png", 6.2)
 
     @skip_unless_feature_version("freetype2", "2.5.0")
     def test_cbdt(self):
@@ -889,8 +871,7 @@ def test_cbdt(self):
 
             d.text((10, 10), "\U0001f469", embedded_color=True, font=font)
 
-            with Image.open("Tests/images/cbdt_notocoloremoji.png") as expected:
-                assert_image_similar(im, expected, 6.2)
+            assert_image_similar_tofile(im, "Tests/images/cbdt_notocoloremoji.png", 6.2)
         except IOError as e:
             assert str(e) in ("unimplemented feature", "unknown file format")
             pytest.skip("freetype compiled without libpng or unsupported")
@@ -909,8 +890,9 @@ def test_cbdt_mask(self):
 
             d.text((10, 10), "\U0001f469", "black", font=font)
 
-            with Image.open("Tests/images/cbdt_notocoloremoji_mask.png") as expected:
-                assert_image_similar(im, expected, 6.2)
+            assert_image_similar_tofile(
+                im, "Tests/images/cbdt_notocoloremoji_mask.png", 6.2
+            )
         except IOError as e:
             assert str(e) in ("unimplemented feature", "unknown file format")
             pytest.skip("freetype compiled without libpng or unsupported")
@@ -928,8 +910,7 @@ def test_colr(self):
 
         d.text((15, 5), "Bungee", embedded_color=True, font=font)
 
-        with Image.open("Tests/images/colr_bungee.png") as expected:
-            assert_image_similar(im, expected, 21)
+        assert_image_similar_tofile(im, "Tests/images/colr_bungee.png", 21)
 
     @skip_unless_feature_version("freetype2", "2.10.0")
     def test_colr_mask(self):
@@ -944,8 +925,7 @@ def test_colr_mask(self):
 
         d.text((15, 5), "Bungee", "black", font=font)
 
-        with Image.open("Tests/images/colr_bungee_mask.png") as expected:
-            assert_image_similar(im, expected, 22)
+        assert_image_similar_tofile(im, "Tests/images/colr_bungee_mask.png", 22)
 
 
 @skip_unless_feature("raqm")
diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py
index 82e2b4ebc2f..655b7662a1e 100644
--- a/Tests/test_imagefontctl.py
+++ b/Tests/test_imagefontctl.py
@@ -4,7 +4,7 @@
 from PIL import Image, ImageDraw, ImageFont, features
 
 from .helper import (
-    assert_image_similar,
+    assert_image_similar_tofile,
     skip_unless_feature,
     skip_unless_feature_version,
 )
@@ -31,8 +31,7 @@ def test_complex_text():
     draw.text((0, 0), "اهلا عمان", font=ttf, fill=500)
 
     target = "Tests/images/test_text.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_y_offset():
@@ -43,8 +42,7 @@ def test_y_offset():
     draw.text((0, 0), "العالم العربي", font=ttf, fill=500)
 
     target = "Tests/images/test_y_offset.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 1.7)
+    assert_image_similar_tofile(im, target, 1.7)
 
 
 def test_complex_unicode_text():
@@ -55,8 +53,7 @@ def test_complex_unicode_text():
     draw.text((0, 0), "السلام عليكم", font=ttf, fill=500)
 
     target = "Tests/images/test_complex_unicode_text.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
     ttf = ImageFont.truetype("Tests/fonts/KhmerOSBattambang-Regular.ttf", FONT_SIZE)
 
@@ -65,8 +62,7 @@ def test_complex_unicode_text():
     draw.text((0, 0), "លោកុប្បត្តិ", font=ttf, fill=500)
 
     target = "Tests/images/test_complex_unicode_text2.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 2.33)
+    assert_image_similar_tofile(im, target, 2.33)
 
 
 def test_text_direction_rtl():
@@ -77,8 +73,7 @@ def test_text_direction_rtl():
     draw.text((0, 0), "English عربي", font=ttf, fill=500, direction="rtl")
 
     target = "Tests/images/test_direction_rtl.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_text_direction_ltr():
@@ -89,8 +84,7 @@ def test_text_direction_ltr():
     draw.text((0, 0), "سلطنة عمان Oman", font=ttf, fill=500, direction="ltr")
 
     target = "Tests/images/test_direction_ltr.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_text_direction_rtl2():
@@ -101,8 +95,7 @@ def test_text_direction_rtl2():
     draw.text((0, 0), "Oman سلطنة عمان", font=ttf, fill=500, direction="rtl")
 
     target = "Tests/images/test_direction_ltr.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_text_direction_ttb():
@@ -117,8 +110,7 @@ def test_text_direction_ttb():
             pytest.skip("libraqm 0.7 or greater not available")
 
     target = "Tests/images/test_direction_ttb.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 2.8)
+    assert_image_similar_tofile(im, target, 2.8)
 
 
 def test_text_direction_ttb_stroke():
@@ -141,8 +133,7 @@ def test_text_direction_ttb_stroke():
             pytest.skip("libraqm 0.7 or greater not available")
 
     target = "Tests/images/test_direction_ttb_stroke.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 19.4)
+    assert_image_similar_tofile(im, target, 19.4)
 
 
 def test_ligature_features():
@@ -152,8 +143,7 @@ def test_ligature_features():
     draw = ImageDraw.Draw(im)
     draw.text((0, 0), "filling", font=ttf, fill=500, features=["-liga"])
     target = "Tests/images/test_ligature_features.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
     liga_size = ttf.getsize("fi", features=["-liga"])
     assert liga_size == (13, 19)
@@ -167,8 +157,7 @@ def test_kerning_features():
     draw.text((0, 0), "TeToAV", font=ttf, fill=500, features=["-kern"])
 
     target = "Tests/images/test_kerning_features.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_arabictext_features():
@@ -185,8 +174,7 @@ def test_arabictext_features():
     )
 
     target = "Tests/images/test_arabictext_features.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_x_max_and_y_offset():
@@ -197,8 +185,7 @@ def test_x_max_and_y_offset():
     draw.text((0, 0), "لح", font=ttf, fill=500)
 
     target = "Tests/images/test_x_max_and_y_offset.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 def test_language():
@@ -209,8 +196,7 @@ def test_language():
     draw.text((0, 0), "абвг", font=ttf, fill=500, language="sr")
 
     target = "Tests/images/test_language.png"
-    with Image.open(target) as target_img:
-        assert_image_similar(im, target_img, 0.5)
+    assert_image_similar_tofile(im, target, 0.5)
 
 
 @pytest.mark.parametrize("mode", ("L", "1"))
@@ -287,8 +273,7 @@ def test_anchor_ttb(anchor):
         if str(ex) == "libraqm 0.7 or greater required for 'ttb' direction":
             pytest.skip("libraqm 0.7 or greater not available")
 
-    with Image.open(path) as expected:
-        assert_image_similar(im, expected, 1)  # fails at 5
+    assert_image_similar_tofile(im, path, 1)  # fails at 5
 
 
 combine_tests = (
@@ -351,8 +336,7 @@ def test_combine(name, text, dir, anchor, epsilon):
         if str(ex) == "libraqm 0.7 or greater required for 'ttb' direction":
             pytest.skip("libraqm 0.7 or greater not available")
 
-    with Image.open(path) as expected:
-        assert_image_similar(im, expected, epsilon)
+    assert_image_similar_tofile(im, path, epsilon)
 
 
 @pytest.mark.parametrize(
@@ -384,8 +368,7 @@ def test_combine_multiline(anchor, align):
     d.rectangle(bbox, outline="red")
     d.multiline_text((200, 200), text, fill="black", anchor=anchor, font=f, align=align)
 
-    with Image.open(path) as expected:
-        assert_image_similar(im, expected, 0.015)
+    assert_image_similar_tofile(im, path, 0.015)
 
 
 def test_anchor_invalid_ttb():
diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index f17bfdd2f60..33489bd1303 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -5,6 +5,7 @@
 from .helper import (
     assert_image_equal,
     assert_image_similar,
+    assert_image_similar_tofile,
     assert_tuple_approx_equal,
     hopper,
 )
@@ -112,10 +113,9 @@ def test_pad():
             new_im = ImageOps.pad(im, new_size, color=color, centering=centering)
             assert new_im.size == new_size
 
-            with Image.open(
-                "Tests/images/imageops_pad_" + label + "_" + str(i) + ".jpg"
-            ) as target:
-                assert_image_similar(new_im, target, 6)
+            assert_image_similar_tofile(
+                new_im, "Tests/images/imageops_pad_" + label + "_" + str(i) + ".jpg", 6
+            )
 
 
 def test_pil163():