File rasterio-1.3.10-Adjust-test-expectations-in-lig... of Package python-rasterio

Overview Repositories Revisions Requests Users Attributes Meta

File rasterio-1.3.10-Adjust-test-expectations-in-light-of-3.9.0-3091.patch of Package python-rasterio (Revision 5dbf8a47d53ff01bb1bafafbd506411d)

Currently displaying revision 5dbf8a47d53ff01bb1bafafbd506411d , Show latest

From 24d0845e576158217f6541c3c81b163d873a994d Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean.gillies@gmail.com>
Date: Fri, 10 May 2024 08:45:37 -0600
Subject: [PATCH] Adjust test expectations in light of 3.9.0 (#3091)

* Adjust test expectations in light of 3.9.0

* Appease flake8

* xfail new shape mask test

See #3074

[lpechacek] Backported to 1.3.10.
---
 tests/test_features.py      | 12 ++++++++++++
 tests/test_mask_creation.py |  3 +++
 tests/test_read.py          |  2 +-
 tests/test_update.py        |  6 +-----
 4 files changed, 17 insertions(+), 6 deletions(-)

--- a/tests/test_features.py
+++ b/tests/test_features.py
@@ -1187,6 +1187,18 @@ def test_sieve_blank_mask(basic_image):
     )
 
 
+@pytest.mark.xfail(reason="Upstream bug in GDAL, see #3074.")
+def test_sieve_all_masked(basic_image):
+    """A blank mask should have no effect."""
+    mask = np.full(basic_image.shape, False)
+    # mask[-1, -1] = True
+    sieved = sieve(basic_image, basic_image.sum(), mask=mask)
+    assert np.array_equal(
+        basic_image,
+        sieved
+    )
+
+
 def test_sieve_invalid_mask_shape(basic_image):
     """A mask that is the wrong shape should fail."""
     with pytest.raises(ValueError):
--- a/tests/test_mask_creation.py
+++ b/tests/test_mask_creation.py
@@ -10,6 +10,8 @@ from rasterio.enums import MaskFlags
 from rasterio.errors import RasterioIOError
 from rasterio.windows import Window
 
+from .conftest import gdal_version
+
 
 def test_create_internal_mask(data):
     """Write an internal mask to the fixture's RGB.byte.tif."""
@@ -32,6 +34,7 @@ def test_create_internal_mask(data):
             assert MaskFlags.nodata not in flags
 
 
+@pytest.mark.xfail(gdal_version.at_least("3.9"), reason="Internal mask are the default since 3.9.0.")
 def test_create_sidecar_mask(data):
     """Write a .msk sidecar mask."""
     with rasterio.open(str(data.join('RGB.byte.tif')), 'r+') as dst:
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -1,5 +1,4 @@
-import subprocess
-import re
+"""Tests of updating a dataset's tags etc."""
 
 import affine
 import numpy as np
@@ -9,7 +8,6 @@ import rasterio
 from rasterio.env import GDALVersion
 
 
-@pytest.mark.gdalbin
 def test_update_tags(data):
     tiffname = str(data.join('RGB.byte.tif'))
     with rasterio.open(tiffname, 'r+') as f:
@@ -19,8 +17,6 @@ def test_update_tags(data):
             f.update_tags(4, d=4)
         assert f.tags() == {'AREA_OR_POINT': 'Area', 'a': '1', 'b': '2'}
         assert ('c', '3') in f.tags(1).items()
-    info = subprocess.check_output(["gdalinfo", tiffname]).decode('utf-8')
-    assert re.search(r'Metadata:\W+a=1\W+AREA_OR_POINT=Area\W+b=2', info)
 
 
 def test_update_band(data):

Places

File rasterio-1.3.10-Adjust-test-expectations-in-light-of-3.9.0-3091.patch of Package python-rasterio (Revision 5dbf8a47d53ff01bb1bafafbd506411d)

Places