Merge pull request #5259 from radarhere/warns

hugovk · web-flow · commit 1857bf557070 · 2021-02-17T21:31:15.000+02:00
diff --git a/Tests/test_bmp_reference.py b/Tests/test_bmp_reference.py
@@ -20,15 +20,15 @@ def test_bad():
     either"""
     for f in get_files("b"):
 
-        def open(f):
+        with pytest.warns(None) as record:
             try:
                 with Image.open(f) as im:
                     im.load()
             except Exception:  # as msg:
                 pass
 
         # Assert that there is no unclosed file warning
-        pytest.warns(None, open, f)
+        assert not record
 
 
 def test_questionable():
diff --git a/Tests/test_file_dcx.py b/Tests/test_file_dcx.py
@@ -31,20 +31,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(TEST_FILE) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_invalid_file():
diff --git a/Tests/test_file_fli.py b/Tests/test_file_fli.py
@@ -38,20 +38,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(static_test_file)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(static_test_file) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_tell():
diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
@@ -38,20 +38,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(TEST_GIF)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(TEST_GIF) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_invalid_file():
diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py
@@ -19,7 +19,9 @@ def test_sanity():
     with Image.open(TEST_FILE) as im:
 
         # Assert that there is no unclosed file warning
-        pytest.warns(None, im.load)
+        with pytest.warns(None) as record:
+            im.load()
+        assert not record
 
         assert im.mode == "RGBA"
         assert im.size == (1024, 1024)
diff --git a/Tests/test_file_im.py b/Tests/test_file_im.py
@@ -35,20 +35,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(TEST_IM)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(TEST_IM) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_tell():
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
@@ -733,7 +733,7 @@ def test_exif_x_resolution(self, tmp_path):
             out = str(tmp_path / "out.jpg")
             with pytest.warns(None) as record:
                 im.save(out, exif=exif)
-            assert len(record) == 0
+            assert not record
 
         with Image.open(out) as reloaded:
             assert reloaded.getexif()[282] == 180
diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py
@@ -41,20 +41,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(test_files[0])
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(test_files[0]) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_app():
diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
@@ -325,7 +325,9 @@ def test_load_verify(self):
 
         with Image.open(TEST_PNG_FILE) as im:
             # Assert that there is no unclosed file warning
-            pytest.warns(None, im.verify)
+            with pytest.warns(None) as record:
+                im.verify()
+            assert not record
 
         with Image.open(TEST_PNG_FILE) as im:
             im.load()
diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
@@ -29,20 +29,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(test_file)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(test_file) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_invalid_file():
diff --git a/Tests/test_file_spider.py b/Tests/test_file_spider.py
@@ -28,20 +28,20 @@ def open():
 
 
 def test_closed_file():
-    def open():
+    with pytest.warns(None) as record:
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_context_manager():
-    def open():
+    with pytest.warns(None) as record:
         with Image.open(TEST_FILE) as im:
             im.load()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_save(tmp_path):
diff --git a/Tests/test_file_tar.py b/Tests/test_file_tar.py
@@ -31,16 +31,16 @@ def open():
 
 
 def test_close():
-    def open():
+    with pytest.warns(None) as record:
         tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
         tar.close()
 
-    pytest.warns(None, open)
+    assert not record
 
 
 def test_contextmanager():
-    def open():
+    with pytest.warns(None) as record:
         with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"):
             pass
 
-    pytest.warns(None, open)
+    assert not record
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -59,19 +59,19 @@ def open():
         pytest.warns(ResourceWarning, open)
 
     def test_closed_file(self):
-        def open():
+        with pytest.warns(None) as record:
             im = Image.open("Tests/images/multipage.tiff")
             im.load()
             im.close()
 
-        pytest.warns(None, open)
+        assert not record
 
     def test_context_manager(self):
-        def open():
+        with pytest.warns(None) as record:
             with Image.open("Tests/images/multipage.tiff") as im:
                 im.load()
 
-        pytest.warns(None, open)
+        assert not record
 
     def test_mac_tiff(self):
         # Read RGBa images from macOS [@PIL136]
diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
@@ -145,7 +145,9 @@ def test_no_resource_warning(self, tmp_path):
         file_path = "Tests/images/hopper.webp"
         with Image.open(file_path) as image:
             temp_file = str(tmp_path / "temp.webp")
-            pytest.warns(None, image.save, temp_file)
+            with pytest.warns(None) as record:
+                image.save(temp_file)
+            assert not record
 
     def test_file_pointer_could_be_reused(self):
         file_path = "Tests/images/hopper.webp"
diff --git a/Tests/test_image.py b/Tests/test_image.py
@@ -641,7 +641,9 @@ def test_no_resource_warning_on_save(self, tmp_path):
 
         # Act/Assert
         with Image.open(test_file) as im:
-            pytest.warns(None, im.save, temp_file)
+            with pytest.warns(None) as record:
+                im.save(temp_file)
+            assert not record
 
     def test_load_on_nonexclusive_multiframe(self):
         with open("Tests/images/frozenpond.mpo", "rb") as fp:
diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py
@@ -234,4 +234,6 @@ def test_no_resource_warning_for_numpy_array():
     with Image.open(test_file) as im:
 
         # Act/Assert
-        pytest.warns(None, lambda: array(im))
+        with pytest.warns(None) as record:
+            array(im)
+        assert not record
