josch/img2pdf
3
6
Fork 10
Code Issues 22 Pull requests 5 Projects Releases 3 Wiki Activity

src/img2pdf_test.py: cater for json output of imagemagick before 6.9.9.34

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-08-04 23:29:42 +02:00
parent 7ccd987d6d
commit 6c742be642
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/img2pdf_test.py
View file

@ -2363,11 +2363,21 @@ def tiff_ccitt_nometa2_img(tmp_path_factory, tmp_gray1_png):
) # remove RowsPerStrip (278) ) # remove RowsPerStrip (278)
identify = json.loads(subprocess.check_output(["convert", str(in_img), "json:"])) identify = json.loads(subprocess.check_output(["convert", str(in_img), "json:"]))
assert len(identify) == 1 assert len(identify) == 1
# somewhere between imagemagick 6.9.7.4 and 6.9.9.34, the json output was
# put into an array, here we cater for the older version containing just
# the bare dictionary
if "image" in identify:
identify = [identify]
assert "image" in identify[0] assert "image" in identify[0]
assert identify[0]["image"]["format"] == "TIFF" assert identify[0]["image"]["format"] == "TIFF"
assert identify[0]["image"]["formatDescription"] == "Tagged Image File Format" assert identify[0]["image"]["formatDescription"] == "Tagged Image File Format"
assert identify[0]["image"]["mimeType"] == "image/tiff" assert identify[0]["image"]["mimeType"] == "image/tiff"
assert identify[0]["image"]["geometry"] == {'width': 60, 'height': 60, 'x': 0, 'y': 0} assert identify[0]["image"]["geometry"] == {
"width": 60,
"height": 60,
"x": 0,
"y": 0,
}
assert identify[0]["image"]["units"] == "PixelsPerInch" assert identify[0]["image"]["units"] == "PixelsPerInch"
assert identify[0]["image"]["type"] == "Bilevel" assert identify[0]["image"]["type"] == "Bilevel"
assert identify[0]["image"]["endianess"] == "Undefined" # FIXME: should be LSB assert identify[0]["image"]["endianess"] == "Undefined" # FIXME: should be LSB