autotest: Make more tests independent

autotest/gcore/hfa_rfc40.py

@@ -34,6 +34,8 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.random_order(disabled=True)
+
 # All tests will be skipped if numpy is unavailable.
 np = pytest.importorskip("numpy")
 

autotest/gcore/histogram.py

@@ -48,13 +48,22 @@ def module_disable_exceptions():
         yield
 
 
+@pytest.fixture()
+def utmsmall_tif(tmp_path):
+    fname = str(tmp_path / "utmsmall.tif")
+
+    shutil.copyfile("data/utmsmall.tif", fname)
+
+    return fname
+
+
 ###############################################################################
 # Fetch simple histogram.
 
 
-def test_histogram_1():
+def test_histogram_1(utmsmall_tif):
 
-    ds = gdal.Open("data/utmsmall.tif")
+    ds = gdal.Open(utmsmall_tif)
     hist = ds.GetRasterBand(1).GetHistogram()
 
     exp_hist = [
@@ -323,9 +332,9 @@ def test_histogram_1():
 # Fetch histogram with specified sampling, using keywords.
 
 
-def test_histogram_2():
+def test_histogram_2(utmsmall_tif):
 
-    ds = gdal.Open("data/utmsmall.tif")
+    ds = gdal.Open(utmsmall_tif)
     hist = ds.GetRasterBand(1).GetHistogram(buckets=16, max=255.5, min=-0.5)
 
     exp_hist = [
@@ -392,9 +401,9 @@ def test_histogram_4():
 # Test GetDefaultHistogram() on the file.
 
 
-def test_histogram_5():
+def test_histogram_5(utmsmall_tif):
 
-    ds = gdal.Open("data/utmsmall.tif")
+    ds = gdal.Open(utmsmall_tif)
     hist = ds.GetRasterBand(1).GetDefaultHistogram(force=1)
 
     exp_hist = (
@@ -665,8 +674,6 @@ def test_histogram_5():
 
     ds = None
 
-    gdal.Unlink("data/utmsmall.tif.aux.xml")
-
 
 ###############################################################################
 # Test GetDefaultHistogram( force = 0 ) on a JPG file (#3304)

autotest/gcore/mask.py

@@ -140,16 +140,18 @@ def test_mask_3():
 
 @pytest.mark.require_driver("JPEG")
 @pytest.mark.require_driver("PNM")
-def test_mask_4():
+def test_mask_4(tmp_path):
 
     src_ds = gdal.Open("../gdrivers/data/jpeg/masked.jpg")
 
     assert src_ds is not None, "Failed to open test dataset."
 
+    output_ppm = str(tmp_path / "mask_4.ppm")
+
     # NOTE: for now we copy to PNM since it does everything (overviews too)
     # externally. Should eventually test with gtiff, hfa.
     drv = gdal.GetDriverByName("PNM")
-    ds = drv.CreateCopy("tmp/mask_4.ppm", src_ds)
+    ds = drv.CreateCopy(output_ppm, src_ds)
     src_ds = None
 
     # confirm we got the custom mask on the copied dataset.
@@ -174,10 +176,17 @@ def test_mask_4():
 # masks built for them.
 
 
+@pytest.mark.require_driver("JPEG")
 @pytest.mark.require_driver("PNM")
-def test_mask_5():
+def test_mask_5(tmp_path):
 
-    ds = gdal.Open("tmp/mask_4.ppm", gdal.GA_Update)
+    src_ds = gdal.Open("../gdrivers/data/jpeg/masked.jpg")
+
+    output_ppm = str(tmp_path / "mask_4.ppm")
+    drv = gdal.GetDriverByName("PNM")
+    ds = drv.CreateCopy(output_ppm, src_ds)
+
+    ds = gdal.Open(output_ppm, gdal.GA_Update)
 
     assert ds is not None, "Failed to open test dataset."
 
@@ -202,7 +211,7 @@ def test_mask_5():
     ds = None
 
     # Reopen and confirm we still get same results.
-    ds = gdal.Open("tmp/mask_4.ppm")
+    ds = gdal.Open(output_ppm)
 
     # confirm mask flags on overview.
     ovr = ds.GetRasterBand(1).GetOverview(1)
@@ -220,8 +229,6 @@ def test_mask_5():
     msk = None
     ds = None
 
-    gdal.GetDriverByName("PNM").Delete("tmp/mask_4.ppm")
-
 
 ###############################################################################
 # Test a TIFF file with 1 band and an embedded mask of 1 bit

autotest/gcore/numpy_rw_multidim.py

@@ -40,9 +40,9 @@
 # verify that we can load Numeric python, and find the Numpy driver.
 
 
-def test_numpy_rw_multidim_init():
+@pytest.fixture(scope="module", autouse=True)
+def setup_and_cleanup():
 
-    gdaltest.numpy_drv = None
     # importing gdal_array will allow numpy driver registration
     pytest.importorskip("osgeo.gdal_array")
 
@@ -57,8 +57,6 @@ def test_numpy_rw_multidim_init():
 
 def test_numpy_rw_multidim_readasarray_writearray():
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     drv = gdal.GetDriverByName("MEM")
@@ -100,8 +98,6 @@ def test_numpy_rw_multidim_readasarray_writearray():
 
 def test_numpy_rw_multidim_numpy_array_as_dataset():
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     from osgeo import gdal_array
@@ -133,8 +129,6 @@ def test_numpy_rw_multidim_numpy_array_as_dataset():
 
 def test_numpy_rw_multidim_readasarray_writearray_negative_strides():
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     drv = gdal.GetDriverByName("MEM")
@@ -177,8 +171,6 @@ def test_numpy_rw_multidim_readasarray_writearray_negative_strides():
 
 def test_numpy_rw_multidim_numpy_array_as_dataset_negative_strides():
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     from osgeo import gdal_array
@@ -211,8 +203,6 @@ def test_numpy_rw_multidim_numpy_array_as_dataset_negative_strides():
 
 def test_numpy_rw_multidim_compound_datatype():
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     from osgeo import gdal_array
@@ -275,8 +265,6 @@ def test_numpy_rw_multidim_compound_datatype():
 )
 def test_numpy_rw_multidim_datatype(datatype):
 
-    if gdaltest.numpy_drv is None:
-        pytest.skip()
     import numpy as np
 
     drv = gdal.GetDriverByName("MEM")