[Git][reproducible-builds/diffoscope][master] Correct import of identify_version after refactoring change in 037bdcbb0.

Chris Lamb (@lamby) gitlab at salsa.debian.org
Tue Jul 23 12:58:51 UTC 2024



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
38f76379 by Chris Lamb at 2024-07-23T13:57:54+01:00
Correct import of identify_version after refactoring change in 037bdcbb0.

- - - - -


1 changed file:

- tests/comparators/test_ico_image.py


Changes:

=====================================
tests/comparators/test_ico_image.py
=====================================
@@ -26,7 +26,7 @@ from ..utils.tools import (
     skip_unless_tools_exist,
     skip_unless_tool_is_between,
 )
-from .test_jpeg_image import identify_version
+from .test_jpeg_image import imagemagick_version
 
 
 image1 = load_fixture("test1.ico")
@@ -61,7 +61,7 @@ def differences_meta(image1_meta, image2_meta):
 
 @skip_unless_tools_exist("img2txt", "identify")
 @skip_unless_tool_is_between(
-    "identify", identify_version, "6.9.10-23", "7.0.0"
+    "identify", lambda: imagemagick_version("identify"), "6.9.10-23", "7.0.0"
 )
 def test_diff_meta(differences_meta):
     assert_diff(differences_meta[-1], "ico_image_meta_expected_diff")
@@ -69,7 +69,7 @@ def test_diff_meta(differences_meta):
 
 @skip_unless_tools_exist("img2txt", "identify")
 @skip_unless_tool_is_between(
-    "identify", identify_version, "6.9.10-23", "7.0.0"
+    "identify", lambda: imagemagick_version("identify"), "6.9.10-23", "7.0.0"
 )
 def test_diff_meta2(differences_meta):
     assert_diff(differences_meta[-1], "ico_image_meta_expected_diff_v2")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20240723/feffe476/attachment.htm>


More information about the rb-commits mailing list