Skip to content

Use assert_image_equal* when similarity is zero #9421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radarhere wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −11
Open

Use assert_image_equal* when similarity is zero #9421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tests/test_file_gif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def test_save_netpbm_bmp_mode(tmp_path: Path) -> None:
b = BytesIO()
GifImagePlugin._save_netpbm(img_rgb, b, tempfile)
with Image.open(tempfile) as reloaded:
assert_image_similar(img_rgb, reloaded.convert("RGB"), 0)
assert_image_equal(img_rgb, reloaded.convert("RGB"))


@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
Expand All @@ -411,7 +411,7 @@ def test_save_netpbm_l_mode(tmp_path: Path) -> None:
b = BytesIO()
GifImagePlugin._save_netpbm(img_l, b, tempfile)
with Image.open(tempfile) as reloaded:
assert_image_similar(img_l, reloaded.convert("L"), 0)
assert_image_equal(img_l, reloaded.convert("L"))


def test_seek() -> None:
Expand Down
2 changes: 1 addition & 1 deletion Tests/test_file_libtiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ def save_bytesio(compression: str | None = None) -> None:
buffer_io.seek(0)

with Image.open(buffer_io) as saved_im:
assert_image_similar(pilim, saved_im, 0)
assert_image_equal(pilim, saved_im)

save_bytesio()
save_bytesio("raw")
Expand Down
2 changes: 1 addition & 1 deletion Tests/test_file_wmf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def test_load_raw() -> None:
# Currently, support for WMF/EMF is Windows-only
im.load()
# Compare to reference rendering
assert_image_similar_tofile(im, "Tests/images/drawing_emf_ref.png", 0)
assert_image_equal_tofile(im, "Tests/images/drawing_emf_ref.png")

# Test basic WMF open and rendering
with Image.open("Tests/images/drawing.wmf") as im:
Expand Down
5 changes: 2 additions & 3 deletions Tests/test_font_pcf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

from .helper import (
assert_image_equal_tofile,
assert_image_similar_tofile,
skip_unless_feature,
)

Expand Down Expand Up @@ -73,7 +72,7 @@ def test_draw(request: pytest.FixtureRequest, tmp_path: Path) -> None:
im = Image.new("L", (130, 30), "white")
draw = ImageDraw.Draw(im)
draw.text((0, 0), message, "black", font=font)
assert_image_similar_tofile(im, "Tests/images/test_draw_pbm_target.png", 0)
assert_image_equal_tofile(im, "Tests/images/test_draw_pbm_target.png")


def test_textsize(request: pytest.FixtureRequest, tmp_path: Path) -> None:
Expand All @@ -100,7 +99,7 @@ def _test_high_characters(
im = Image.new("L", (750, 30), "white")
draw = ImageDraw.Draw(im)
draw.text((0, 0), message, "black", font=font)
assert_image_similar_tofile(im, "Tests/images/high_ascii_chars.png", 0)
assert_image_equal_tofile(im, "Tests/images/high_ascii_chars.png")


def test_high_characters(request: pytest.FixtureRequest, tmp_path: Path) -> None:
Expand Down
3 changes: 1 addition & 2 deletions Tests/test_font_pcf_charsets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

from .helper import (
assert_image_equal_tofile,
assert_image_similar_tofile,
skip_unless_feature,
)

Expand Down Expand Up @@ -85,7 +84,7 @@ def test_draw(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) ->
draw = ImageDraw.Draw(im)
message = charsets[encoding]["message"].encode(encoding)
draw.text((0, 0), message, "black", font=font)
assert_image_similar_tofile(im, charsets[encoding]["image1"], 0)
assert_image_equal_tofile(im, charsets[encoding]["image1"])


@pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
Expand Down
4 changes: 2 additions & 2 deletions Tests/test_uploader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from .helper import assert_image_equal, assert_image_similar, hopper
from .helper import assert_image_equal, hopper


def check_upload_equal() -> None:
Expand All @@ -12,4 +12,4 @@ def check_upload_equal() -> None:
def check_upload_similar() -> None:
result = hopper("P").convert("RGB")
target = hopper("RGB")
assert_image_similar(result, target, 0)
assert_image_equal(result, target)
Loading