Corrected check for libtiff feature #7975

radarhere · 2024-04-13T13:20:37Z

Lines 55 to 61 in db21e7d

    
           def test_ifd_rational_save(tmp_path: Path) -> None: 
        
               methods = [True] 
        
               if features.check("libtiff"): 
        
                   methods.append(False) 
        
               for libtiff in methods: 
        
                   TiffImagePlugin.WRITE_LIBTIFF = libtiff

This is the wrong way around. WRITE_LIBTIFF should be True when libtiff is available.

To demonstrate, if I skip building libtiff on Windows, it fails. With this change, it passes.

nulano · 2024-04-13T13:42:06Z

Should we use pytest.parameterize with a skip mark to make it clear that the WRITE_LIBTIFF = True test was skipped in the logs?

radarhere · 2024-04-14T12:19:28Z

Ok, I've updated the commit.

nulano

Do we want to use monkeypatch in case the save method raises an exception?

nulano · 2024-04-15T21:13:20Z

Tests/test_tiff_ifdrational.py

+@pytest.mark.parametrize(
+    "libtiff", (pytest.param(True, marks=skip_unless_feature("libtiff")), False)
+)
+def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None:


Suggested change

def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None:

def test_ifd_rational_save(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool) -> None:

nulano · 2024-04-15T21:14:49Z

Tests/test_tiff_ifdrational.py

-        out = str(tmp_path / "temp.tiff")
-        res = IFDRational(301, 1)
-        im.save(out, dpi=(res, res), compression="raw")
+    TiffImagePlugin.WRITE_LIBTIFF = libtiff


Suggested change

TiffImagePlugin.WRITE_LIBTIFF = libtiff

monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)

nulano · 2024-04-15T21:14:56Z

Tests/test_tiff_ifdrational.py

-        im.save(out, dpi=(res, res), compression="raw")
+    TiffImagePlugin.WRITE_LIBTIFF = libtiff
+    im.save(out, dpi=(res, res), compression="raw")
+    TiffImagePlugin.WRITE_LIBTIFF = False


Suggested change

TiffImagePlugin.WRITE_LIBTIFF = False

radarhere · 2024-04-18T07:58:16Z

I've pushed a commit to use monkeypatch whenever the tests set READ_LIBTIFF or WRITE_LIBTIFF

nulano · 2024-04-18T16:45:11Z

Tests/test_file_libtiff.py

-        libtiffs = []
+        libtiffs = [False]
        if Image.core.libtiff_support_custom_tags:
            libtiffs.append(True)


This can also use pytest.mark.parametrize

nulano

Looks good; I just noticed one more test that can be parametrized.

nulano · 2024-04-19T06:52:12Z

Tests/test_imagesequence.py

-    TiffImagePlugin.READ_LIBTIFF = True
+def test_libtiff(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
    _test_multipage_tiff()


While not as useful, these two tests can also be combined into one with pytest.mark.parametrize for slightly shorter code.

radarhere added TIFF Testing labels Apr 13, 2024

radarhere force-pushed the libtiff branch from 4bf1531 to 4e33eb6 Compare April 14, 2024 11:50

Corrected check for libtiff feature

7102980

radarhere force-pushed the libtiff branch from 4e33eb6 to 7102980 Compare April 14, 2024 11:57

nulano reviewed Apr 15, 2024

View reviewed changes

radarhere force-pushed the libtiff branch from 6699918 to 2661d9a Compare April 18, 2024 07:54

Use monkeypatch to set READ_LIBTIFF and WRITE_LIBTIFF

28f436c

radarhere force-pushed the libtiff branch from 2661d9a to 28f436c Compare April 18, 2024 07:57

nulano reviewed Apr 18, 2024

View reviewed changes

Parametrize test

533f78e

nulano approved these changes Apr 19, 2024

View reviewed changes

Combine tests through parametrization

11ac0c1

nulano approved these changes Apr 19, 2024

View reviewed changes

radarhere merged commit eee633c into python-pillow:main Apr 21, 2024

radarhere deleted the libtiff branch April 21, 2024 23:01

radarhere mentioned this pull request Apr 22, 2024

Corrected check for libtiff feature #8000

Merged

	def test_ifd_rational_save(tmp_path: Path) -> None:
	methods = [True]
	if features.check("libtiff"):
	methods.append(False)

	for libtiff in methods:
	TiffImagePlugin.WRITE_LIBTIFF = libtiff

	def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None:
	def test_ifd_rational_save(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool) -> None:

	TiffImagePlugin.WRITE_LIBTIFF = libtiff
	monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)

Uh oh!

Corrected check for libtiff feature #7975

Corrected check for libtiff feature #7975

Uh oh!

Conversation

radarhere commented Apr 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nulano commented Apr 13, 2024

Uh oh!

radarhere commented Apr 14, 2024

Uh oh!

nulano left a comment

Choose a reason for hiding this comment

Uh oh!

nulano Apr 15, 2024

Choose a reason for hiding this comment

Uh oh!

nulano Apr 15, 2024

Choose a reason for hiding this comment

Uh oh!

nulano Apr 15, 2024

Choose a reason for hiding this comment

Uh oh!

radarhere commented Apr 18, 2024

Uh oh!

nulano Apr 18, 2024

Choose a reason for hiding this comment

Uh oh!

radarhere Apr 18, 2024

Choose a reason for hiding this comment

Uh oh!

nulano left a comment

Choose a reason for hiding this comment

Uh oh!

nulano Apr 19, 2024

Choose a reason for hiding this comment

Uh oh!

radarhere Apr 19, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

radarhere commented Apr 13, 2024 •

edited

Loading