tests: Call t.remove and g.remove once with multiple inputs as list (#…

…4523) * t.rast.accumulate: Call t.remove with multiple inputs in test_accumulation * t.rast.accdetect: Call t.remove with multiple inputs * t.rast.univar: Call t.remove once with multiple inputs * tests: Call g.remove once with multiple names to remove One call per type, when all other arguments are the same * benchmark: Call g.remove once with multiple names to remove One call per type, when all other arguments are the same * utils/thumbnails: Call g.remove once with multiple names to remove * Use tuple for supplying multiple input maps
OSGeo · Oct 18, 2024 · 6fd21a8 · 6fd21a8
1 parent 0cb20eb
commit 6fd21a8
Show file tree

Hide file tree

Showing 34 changed files with 151 additions and 155 deletions.
diff --git a/imagery/i.gensig/testsuite/test_i_gensig.py b/imagery/i.gensig/testsuite/test_i_gensig.py
@@ -92,9 +92,13 @@ def tearDownClass(cls):
         """Remove the temporary region and generated data"""
         cls.del_temp_region()
         shutil.rmtree(cls.sig_dir1, ignore_errors=True)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.b1, quiet=True)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.b2, quiet=True)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.train, quiet=True)
+        cls.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(cls.b1, cls.b2, cls.train),
+            quiet=True,
+        )
 
     def test_creation(self):
         """Test creating a signature"""

diff --git a/imagery/i.maxlik/testsuite/test_i_maxlik.py b/imagery/i.maxlik/testsuite/test_i_maxlik.py
@@ -163,13 +163,12 @@ def tearDownClass(cls):
         cls.del_temp_region()
         shutil.rmtree(cls.sig_dir1, ignore_errors=True)
         shutil.rmtree(cls.sig_dir2, ignore_errors=True)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.b1, quiet=True)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.b2, quiet=True)
         cls.runModule(
-            "g.remove", flags="f", type="raster", name=cls.v1_class, quiet=True
-        )
-        cls.runModule(
-            "g.remove", flags="f", type="raster", name=cls.v2_class, quiet=True
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(cls.b1, cls.b2, cls.v1_class, cls.v2_class),
+            quiet=True,
         )
         cls.runModule("g.remove", flags="f", type="group", name=cls.group, quiet=True)
 

diff --git a/imagery/i.vi/testsuite/test_vi.py b/imagery/i.vi/testsuite/test_vi.py
@@ -26,14 +26,12 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        cls.runModule("g.remove", flags="f", type="raster", name="ipvi")
-        cls.runModule("g.remove", flags="f", type="raster", name="ndwi")
-        cls.runModule("g.remove", flags="f", type="raster", name="dvi")
-        cls.runModule("g.remove", flags="f", type="raster", name="sr")
-        cls.runModule("g.remove", flags="f", type="raster", name="evi")
-        cls.runModule("g.remove", flags="f", type="raster", name="evi2")
-        cls.runModule("g.remove", flags="f", type="raster", name="gari")
-        cls.runModule("g.remove", flags="f", type="raster", name="gemi")
+        cls.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name="ipvi,ndwi,dvi,sr,evi,evi2,gari,gemi",
+        )
         cls.del_temp_region()
 
     def test_vinameipvi(self):

diff --git a/lib/imagery/testsuite/test_imagery_sigfile.py b/lib/imagery/testsuite/test_imagery_sigfile.py
@@ -349,9 +349,12 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.del_temp_region()
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map1)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map2)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map3)
+        cls.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(cls.map1, cls.map2, cls.map3),
+        )
 
     def test_symmetric_complete_difference(self):
         # Prepare imagery group reference struct

diff --git a/lib/imagery/testsuite/test_imagery_sigsetfile.py b/lib/imagery/testsuite/test_imagery_sigsetfile.py
@@ -242,9 +242,12 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.del_temp_region()
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map1)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map2)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.map3)
+        cls.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(cls.map1, cls.map2, cls.map3),
+        )
 
     def test_symmetric_complete_difference(self):
         # Prepare imagery group reference struct

diff --git a/raster/r.contour/testsuite/test_r_contour.py b/raster/r.contour/testsuite/test_r_contour.py
@@ -32,10 +32,11 @@ def setUpClass(cls):
     def tearDownClass(cls):
         cls.del_temp_region()
 
-        cls.runModule("g.remove", type="vector", flags="f", name=cls.output)
-        cls.runModule("g.remove", type="vector", flags="f", name=cls.output + "_cut")
         cls.runModule(
-            "g.remove", type="vector", flags="f", name=cls.output + "_cut_flag_t"
+            "g.remove",
+            type="vector",
+            flags="f",
+            name=(cls.output, cls.output + "_cut", cls.output + "_cut_flag_t"),
         )
 
         if os.path.isfile("testReport"):

diff --git a/raster/r.in.pdal/testsuite/test_r_in_pdal_binning.py b/raster/r.in.pdal/testsuite/test_r_in_pdal_binning.py
@@ -68,8 +68,12 @@ def tearDown(self):
 
         This is executed after each test run.
         """
-        self.runModule("g.remove", flags="f", type="raster", name=self.bin_raster)
-        self.runModule("g.remove", flags="f", type="raster", name=self.ref_raster)
+        self.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(self.bin_raster, self.ref_raster),
+        )
 
     @unittest.skipIf(shutil.which("r.in.pdal") is None, "Cannot find r.in.pdal")
     def test_method_n(self):

diff --git a/raster/r.in.pdal/testsuite/test_r_in_pdal_selection.py b/raster/r.in.pdal/testsuite/test_r_in_pdal_selection.py
@@ -67,8 +67,12 @@ def tearDown(self):
 
         This is executed after each test run.
         """
-        self.runModule("g.remove", flags="f", type="raster", name=self.imp_raster)
-        self.runModule("g.remove", flags="f", type="raster", name=self.ref_raster)
+        self.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name=(self.imp_raster, self.ref_raster),
+        )
         try:
             self.runModule("g.remove", flags="f", type="raster", name=self.base_raster)
         except AttributeError:

diff --git a/raster/r.kappa/testsuite/test_r_kappa.py b/raster/r.kappa/testsuite/test_r_kappa.py
@@ -51,8 +51,9 @@ def setUpClass(cls):
     def tearDownClass(cls):
         """Remove temporary data"""
         cls.del_temp_region()
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
+        cls.runModule(
+            "g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
+        )
 
     def test_m(self):
         """Test printing matrix only
@@ -119,8 +120,9 @@ def setUpClass(cls):
     def tearDownClass(cls):
         """Remove temporary data"""
         cls.del_temp_region()
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
+        cls.runModule(
+            "g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
+        )
 
     def match(self, pat, ref):
         if pat == "NA" or ref == "NA":
@@ -233,8 +235,9 @@ def setUpClass(cls):
     def tearDownClass(cls):
         """Remove temporary data"""
         cls.del_temp_region()
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
+        cls.runModule(
+            "g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
+        )
 
     def match(self, pat, ref):
         if pat == "NA" or ref == "NA":

diff --git a/raster/r.mfilter/benchmark/benchmark_r_mfilter_nprocs.py b/raster/r.mfilter/benchmark/benchmark_r_mfilter_nprocs.py
@@ -55,8 +55,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.neighbors/benchmark/benchmark_r_neighbors_nprocs.py b/raster/r.neighbors/benchmark/benchmark_r_neighbors_nprocs.py
@@ -38,8 +38,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.random/testsuite/test_r_random.py b/raster/r.random/testsuite/test_r_random.py
@@ -28,30 +28,30 @@ def setUpClass(cls):
     def tearDownClass(cls):
         cls.del_temp_region()
 
-        cls.runModule("g.remove", type="raster", flags="f", name=cls.raster)
-        cls.runModule("g.remove", type="raster", flags="f", name=cls.raster + "_null")
-        cls.runModule(
-            "g.remove", type="raster", flags="f", name=cls.raster + "_without_topology"
-        )
-        cls.runModule("g.remove", type="raster", flags="f", name=cls.raster + "_3D")
         cls.runModule(
             "g.remove",
             type="raster",
             flags="f",
-            name=cls.raster + "_cover_landcover_1m",
+            name=(
+                cls.raster,
+                cls.raster + "_null",
+                cls.raster + "_without_topology",
+                cls.raster + "_3D",
+                cls.raster + "_cover_landcover_1m",
+            ),
         )
 
-        cls.runModule("g.remove", type="vector", flags="f", name=cls.vector)
-        cls.runModule("g.remove", type="vector", flags="f", name=cls.vector + "_null")
-        cls.runModule(
-            "g.remove", type="vector", flags="f", name=cls.vector + "_without_topology"
-        )
-        cls.runModule("g.remove", type="vector", flags="f", name=cls.vector + "_3D")
         cls.runModule(
             "g.remove",
             type="vector",
             flags="f",
-            name=cls.vector + "_cover_landcover_1m",
+            name=(
+                cls.vector,
+                cls.vector + "_null",
+                cls.vector + "_without_topology",
+                cls.vector + "_3D",
+                cls.vector + "_cover_landcover_1m",
+            ),
         )
 
     def test_random_raster(self):

diff --git a/raster/r.resamp.filter/benchmark/benchmark_r_resamp_filter.py b/raster/r.resamp.filter/benchmark/benchmark_r_resamp_filter.py
@@ -40,8 +40,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=8, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.resamp.interp/benchmark/benchmark_r_resamp_interp.py b/raster/r.resamp.interp/benchmark/benchmark_r_resamp_interp.py
@@ -38,8 +38,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.series/benchmark/benchmark_r_series.py b/raster/r.series/benchmark/benchmark_r_series.py
@@ -37,8 +37,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect.py b/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect.py
@@ -42,11 +42,13 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=slope)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=aspect)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=pcurv)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=tcurv)
+    Module(
+        "g.remove",
+        quiet=True,
+        flags="f",
+        type="raster",
+        name=(reference, slope, aspect, pcurv, tcurv),
+    )
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py b/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py
@@ -46,10 +46,13 @@ def benchmark(memory, label, results, reference):
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=20, repeat=10))
 
-    Module("g.remove", quiet=True, flags="f", type="raster", name=slope)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=aspect)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=pcurv)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=tcurv)
+    Module(
+        "g.remove",
+        quiet=True,
+        flags="f",
+        type="raster",
+        name=(slope, aspect, pcurv, tcurv),
+    )
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.tile/testsuite/test_r_tile.py b/raster/r.tile/testsuite/test_r_tile.py
@@ -28,42 +28,20 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.del_temp_region()
-        cls.runModule(
-            "g.remove", type="raster", flags="f", name=cls.output_prefix + "-000-000"
-        )
-        cls.runModule(
-            "g.remove", type="raster", flags="f", name=cls.output_prefix + "-000-001"
-        )
-        cls.runModule(
-            "g.remove", type="raster", flags="f", name=cls.output_prefix + "-001-000"
-        )
-        cls.runModule(
-            "g.remove", type="raster", flags="f", name=cls.output_prefix + "-001-001"
-        )
-
-        cls.runModule(
-            "g.remove",
-            type="raster",
-            flags="f",
-            name=cls.output_prefix + "overlap" + "-000-000",
-        )
-        cls.runModule(
-            "g.remove",
-            type="raster",
-            flags="f",
-            name=cls.output_prefix + "overlap" + "-000-001",
-        )
-        cls.runModule(
-            "g.remove",
-            type="raster",
-            flags="f",
-            name=cls.output_prefix + "overlap" + "-001-000",
-        )
         cls.runModule(
             "g.remove",
             type="raster",
             flags="f",
-            name=cls.output_prefix + "overlap" + "-001-001",
+            name=(
+                cls.output_prefix + "-000-000",
+                cls.output_prefix + "-000-001",
+                cls.output_prefix + "-001-000",
+                cls.output_prefix + "-001-001",
+                cls.output_prefix + "overlap" + "-000-000",
+                cls.output_prefix + "overlap" + "-000-001",
+                cls.output_prefix + "overlap" + "-001-000",
+                cls.output_prefix + "overlap" + "-001-001",
+            ),
         )
 
     def test_raster_tile(self):

diff --git a/raster/r.univar/benchmark/benchmark_r_univar.py b/raster/r.univar/benchmark/benchmark_r_univar.py
@@ -35,8 +35,7 @@ def benchmark(size, label, results):
         overwrite=True,
     )
     results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
-    Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
-    Module("g.remove", quiet=True, flags="f", type="raster", name=output)
+    Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))
 
 
 def generate_map(rows, cols, fname):

diff --git a/raster/r.univar/testsuite/test_r_univar.py b/raster/r.univar/testsuite/test_r_univar.py
@@ -23,11 +23,12 @@ def tearDownClass(cls):
         cls.del_temp_region()
 
     def tearDown(self):
-        self.runModule("g.remove", flags="f", type="raster", name="map_a")
-        self.runModule("g.remove", flags="f", type="raster", name="map_b")
-        self.runModule("g.remove", flags="f", type="raster", name="map_negative")
-        self.runModule("g.remove", flags="f", type="raster", name="zone_map")
-        self.runModule("g.remove", flags="f", type="raster", name="zone_map_with_gap")
+        self.runModule(
+            "g.remove",
+            flags="f",
+            type="raster",
+            name="map_a,map_b,map_negative,zone_map,zone_map_with_gap",
+        )
 
     def setUp(self):
         """Create input data"""

diff --git a/raster3d/r3.null/testsuite/test.r3.null.sh b/raster3d/r3.null/testsuite/test.r3.null.sh
@@ -56,14 +56,7 @@ diff data/test_volume_double_null_1.ref test_volume_double_null_1.txt
 diff data/test_volume_double_null_2.ref test_volume_double_null_2.txt
 
 # Cleanup
-g.remove -f type=raster_3d name=test_volume_float_1
-g.remove -f type=raster_3d name=test_volume_float_2
-g.remove -f type=raster_3d name=test_volume_float_null_1
-g.remove -f type=raster_3d name=test_volume_float_null_2
-g.remove -f type=raster_3d name=test_volume_double_1
-g.remove -f type=raster_3d name=test_volume_double_2
-g.remove -f type=raster_3d name=test_volume_double_null_1
-g.remove -f type=raster_3d name=test_volume_double_null_2
+g.remove -f type=raster_3d name=test_volume_float_1,test_volume_float_2,test_volume_float_null_1,test_volume_float_null_2,test_volume_double_1,test_volume_double_2,test_volume_double_null_1,test_volume_double_null_2
 rm test_volume_float_1.txt
 rm test_volume_float_2.txt
 rm test_volume_float_null_1.txt