From dfcaa52bec18d959d022f11c33e886fac230b037 Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Thu, 19 Aug 2021 01:14:48 +0200 Subject: [PATCH] tests: don't expect ImageMagick to compress TIFF files by default This is no longer the case with ImageMagick 7. --- src/img2pdf_test.py | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/img2pdf_test.py b/src/img2pdf_test.py index d5be82d..e05ea86 100755 --- a/src/img2pdf_test.py +++ b/src/img2pdf_test.py @@ -1146,7 +1146,6 @@ def png_rgb8_img(tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -1196,7 +1195,6 @@ def png_rgb16_img(tmp_normal16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "16" @@ -1250,7 +1248,6 @@ def png_rgba8_img(tmp_path_factory, tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -1301,7 +1298,6 @@ def png_rgba16_img(tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "16" @@ -1368,7 +1364,6 @@ def png_gray8a_img(tmp_path_factory, tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -1431,7 +1426,6 @@ def png_gray16a_img(tmp_path_factory, tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "16" @@ -1486,7 +1480,6 @@ def png_interlaced_img(tmp_path_factory, tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -1538,7 +1531,6 @@ def png_gray1_img(tmp_path_factory, tmp_gray1_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "1" ), str(identify) @@ -1589,7 +1581,6 @@ def png_gray2_img(tmp_path_factory, tmp_gray2_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "2" ), str(identify) @@ -1640,7 +1631,6 @@ def png_gray4_img(tmp_path_factory, tmp_gray4_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "4" ), str(identify) @@ -1691,7 +1681,6 @@ def png_gray8_img(tmp_path_factory, tmp_gray8_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -1742,7 +1731,6 @@ def png_gray16_img(tmp_path_factory, tmp_gray16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "16" @@ -1794,7 +1782,6 @@ def png_palette1_img(tmp_path_factory, tmp_palette1_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "1" ), str(identify) @@ -1845,7 +1832,6 @@ def png_palette2_img(tmp_path_factory, tmp_palette2_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "2" ), str(identify) @@ -1896,7 +1882,6 @@ def png_palette4_img(tmp_path_factory, tmp_palette4_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "4" ), str(identify) @@ -1947,7 +1932,6 @@ def png_palette8_img(tmp_path_factory, tmp_palette8_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify) @@ -2257,7 +2241,6 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("quantum:format") == "floating-point" @@ -2310,7 +2293,6 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2368,7 +2350,6 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2416,7 +2397,6 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2469,7 +2449,6 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2522,7 +2501,6 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2571,7 +2549,6 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2620,7 +2597,6 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated" ), str(identify) @@ -2669,7 +2645,6 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated" ), str(identify) @@ -2716,7 +2691,6 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2764,7 +2738,6 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2812,7 +2785,6 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2860,7 +2832,6 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2908,7 +2879,6 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -2960,7 +2930,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3001,7 +2970,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3051,7 +3019,6 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3100,7 +3067,6 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3149,7 +3115,6 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3197,7 +3162,6 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" ), str(identify) @@ -3727,7 +3691,6 @@ def png_icc_img(tmp_icc_png): "x": 0, "y": 0, }, str(identify) - assert identify[0]["image"].get("compression") == "Zip", str(identify) assert ( identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" ), str(identify)