Compare commits

..

3 commits

Author SHA1 Message Date
4166367318
tests: vendor sRGB.icc instead of relying on distro-specific paths 2021-08-19 01:39:40 +02:00
dfcaa52bec
tests: don't expect ImageMagick to compress TIFF files by default
This is no longer the case with ImageMagick 7.
2021-08-19 01:38:21 +02:00
a143e31eb1
tests: don't check formatDescription
With Imagemagick 7, it returns the same thing as "format", which is
already checked.
2021-08-19 01:37:11 +02:00
2 changed files with 1 additions and 15 deletions

View file

@ -21,17 +21,7 @@ import json
import pathlib import pathlib
SCRIPT_DIR = pathlib.Path(__file__).resolve().parent SCRIPT_DIR = pathlib.Path(__file__).resolve().parent
ICC_PROFILE = None ICC_PROFILE = SCRIPT_DIR / "tests" / "data" / "sRGB.icc"
ICC_PROFILE_PATHS = (
"/usr/share/color/icc/ghostscript/srgb.icc",
"/usr/share/ghostscript/9.54.0/iccprofiles/srgb.icc",
"/usr/share/color/icc/sRGB.icc",
"/usr/share/color/icc/OpenICC/sRGB.icc",
)
for path in ICC_PROFILE_PATHS:
if os.path.exists(path):
ICC_PROFILE = path
break
HAVE_MUTOOL = True HAVE_MUTOOL = True
try: try:
@ -317,8 +307,6 @@ def compare(im1, im2, exact, icc, cmyk):
else: else:
iccargs = [] iccargs = []
if icc: if icc:
if ICC_PROFILE is None:
pytest.skip("Could not locate an ICC profile")
iccargs = ["-profile", ICC_PROFILE] iccargs = ["-profile", ICC_PROFILE]
psnr = subprocess.run( psnr = subprocess.run(
["compare"] ["compare"]
@ -432,8 +420,6 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False):
) )
else: else:
if icc: if icc:
if ICC_PROFILE is None:
pytest.skip("Could not locate an ICC profile")
psnr = subprocess.run( psnr = subprocess.run(
[ [
"compare", "compare",

BIN
src/tests/data/sRGB.icc Normal file

Binary file not shown.