t.remove: new implementation of flags (#1695)

* t.remove: new implementation of flags

* modified temporal tests updating t.remove call with new d flag instead r

temporal/t.rast.accdetect/testsuite/test_simple.py

@@ -57,12 +57,12 @@ class TestRasterExtraction(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
-        self.runModule("t.remove", flags="rf", type="strds", inputs="C")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="C")
 
     def test_simple(self):
         self.assertModule(

temporal/t.rast.accumulate/testsuite/test_accumulation.py

@@ -94,14 +94,14 @@ class TestAccumulate(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="Lower")
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="Upper")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="Lower")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="Upper")
         cls.del_temp_region()
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
 
     def test_1(self):
         self.assertModule(

temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py

@@ -55,11 +55,11 @@ class TestAggregationAbsolute(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
 
     def test_disaggregation(self):
         """Disaggregation with empty maps"""

temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py

@@ -58,11 +58,11 @@ class TestAggregationAbsoluteParallel(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
 
     def test_aggregation_12hours(self):
         """Aggregation one month"""

temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py

@@ -56,11 +56,11 @@ class TestAggregationRelative(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
 
     def test_1(self):
         """Simple test"""

temporal/t.rast.algebra/testsuite/test_raster_algebra.py

@@ -110,12 +110,12 @@ class TestTRastAlgebra(TestCase):
         )
 
     def tearDown(self):
-        self.runModule("t.remove", flags="rf", inputs="R", quiet=True)
+        self.runModule("t.remove", flags="df", inputs="R", quiet=True)
 
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", inputs="A,B,C,D", quiet=True)
+        cls.runModule("t.remove", flags="df", inputs="A,B,C,D", quiet=True)
         cls.runModule("t.unregister", maps="singletmap", quiet=True)
         cls.del_temp_region()
 

temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py

@@ -133,12 +133,12 @@ class TestTRastAlgebraGranularity(TestCase):
         )
 
     def tearDown(self):
-        self.runModule("t.remove", flags="rf", inputs="R", quiet=True)
+        self.runModule("t.remove", flags="df", inputs="R", quiet=True)
 
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", inputs="A,B,C,D", quiet=True)
+        cls.runModule("t.remove", flags="df", inputs="A,B,C,D", quiet=True)
         cls.runModule("t.unregister", maps="singletmap", quiet=True)
         cls.del_temp_region()
 

temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py

@@ -45,7 +45,7 @@ class TestTRastAlgebraGranularityFails(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", inputs="A", quiet=True)
+        cls.runModule("t.remove", flags="df", inputs="A", quiet=True)
         cls.runModule("t.unregister", maps="singletmap", quiet=True)
         cls.del_temp_region()
 

temporal/t.rast.contour/testsuite/test_convert.py

@@ -48,12 +48,12 @@ class TestRasterContour(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="result")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="result")
 
     def test_register_empty_maps(self):
         self.assertModule(
@@ -311,7 +311,7 @@ class TestRasterContourFails(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def test_error_handling(self):

temporal/t.rast.export/testsuite/test_rast_export.py

@@ -62,7 +62,7 @@ class TestRasterExport(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", inputs="A")
+        cls.runModule("t.remove", flags="df", inputs="A")
 
     def test_simple_geotif(self):
         self.assertModule(

temporal/t.rast.extract/testsuite/test_t_rast_extract.py

@@ -85,7 +85,7 @@ class TestRasterExtraction(TestCase):
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="precip_abs2")
+        self.runModule("t.remove", flags="df", type="strds", inputs="precip_abs2")
 
     def test_selection(self):
         """Perform a simple selection by datetime"""

temporal/t.rast.gapfill/testsuite/test_gapfill.py

@@ -72,7 +72,7 @@ class TestRasterToVector(TestCase):
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        self.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_simple_2procs(self):
         self.assertModule(

temporal/t.rast.import/testsuite/test_temporal_rast_import.py

@@ -27,7 +27,7 @@ class TestRasterImport(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", inputs="A")
+        cls.runModule("t.remove", flags="df", inputs="A")
 
     def test_import(self):
         self.assertModule(

temporal/t.rast.neighbors/testsuite/test_neighbors.py

@@ -56,11 +56,11 @@ class TestAggregationAbsolute(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+        self.runModule("t.remove", flags="df", type="strds", inputs="B")
 
     def test_where(self):
         """Test simple t.rast.neighbors"""

temporal/t.rast.series/testsuite/test_series.py

@@ -52,7 +52,7 @@ class TestSnapAbsoluteSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.runModule(
             "t.unregister",
             type="raster",
@@ -196,7 +196,7 @@ class TestSnapRelativeSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.runModule(
             "t.unregister",
             type="raster",

temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py

@@ -102,7 +102,7 @@ class TestSTRDSToRast3(TestCase):
     def tearDown(self):
         """Remove generated data"""
         self.runModule(
-            "t.remove", flags="rf", type="strds", inputs="precip_i,precip_f,precip_d"
+            "t.remove", flags="df", type="strds", inputs="precip_i,precip_f,precip_d"
         )
         self.runModule("g.remove", type="raster", pattern="prec_*", flags="f")
         self.runModule("g.remove", type="raster_3d", pattern="precip_*", flags="f")
@@ -286,7 +286,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove generated data"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="precip_d")
         cls.runModule("g.remove", type="raster", pattern="prec_*", flags="f")
         cls.del_temp_region()
 

temporal/t.rast.to.vect/testsuite/test_to_vect.py

@@ -49,12 +49,12 @@ class TestRasterToVector(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="result")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="result")
 
     def test_simple_points(self):
         self.assertModule(
@@ -245,7 +245,7 @@ class TestRasterToVectorFails(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def test_error_handling(self):

temporal/t.rast.univar/testsuite/test_t_rast_univar.py

@@ -47,7 +47,7 @@ class TestRasterUnivar(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def test_1(self):

temporal/t.rast.what/testsuite/test_what.py

@@ -49,7 +49,7 @@ class TestRasterWhat(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def test_row_output(self):
@@ -384,7 +384,7 @@ class TestRasterWhatNull(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
         cls.del_temp_region()
 
     def test_null_value(self):

temporal/t.rast3d.extract/testsuite/test_t_rast3d_extract.py

@@ -58,7 +58,7 @@ class TestRaster3dExtraction(TestCase):
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("t.remove", flags="rf", type="str3ds", inputs="A,B")
+        self.runModule("t.remove", flags="df", type="str3ds", inputs="A,B")
 
     def test_selection(self):
         """Perform a simple selection by datetime"""

temporal/t.rast3d.univar/testsuite/test_t_rast3d_univar.py

@@ -47,7 +47,7 @@ class TestRasterUnivar(TestCase):
     @classmethod
     def tearDownClass(cls):
         """Remove the temporary region"""
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
         cls.del_temp_region()
 
     def test_1(self):

temporal/t.remove/t.remove.html

@@ -2,12 +2,13 @@
 
 The module <em>t.remove</em> removes space time datasets (STRDS, STR3DS,
 STVDS) from the temporal database. In other words, by default it deletes
-the relevant database entries but not the maps.
+the relevant database entries. It can also unregister maps from temporal
+database using the recursive mode <b>-r</b> (recursive)
 <p>
 Optionally, also the raster, 3D raster and vector maps of the space time
-datasets can be removed from the current mapset using the <b>-r</b> (recursive)
-and <b>-f</b> (force) flags. This recursive removal only works if both flags
-are checked together (use <b>-rf</b>).
+datasets can be removed from the current mapset using the <b>-d</b> (delete)
+flag.
+All removals only work if <b>-f</b> (force) flag is used.
 
 <h2>EXAMPLE</h2>
 
@@ -38,11 +39,12 @@ t.rast.aggregate input=precip_months_sum \
   years" method=sum
 
 #Remove all newly produced data:
+
 # a) the aggregated STRDS with 1 years granularity along with its raster maps
-t.remove -rf type=strds input=precip_years_sum
+t.remove -df type=strds input=precip_years_sum
 
 # b) the STRDS with 1 months granularity, but not the original sample data
-t.remove type=strds input=precip_months_sum
+t.remove -f type=strds input=precip_months_sum
 </pre></div>
 
 <h2>SEE ALSO</h2>
@@ -61,4 +63,3 @@ S&ouml;ren Gebbert, Th&uuml;nen Institute of Climate-Smart Agriculture
 <p>
 <i>Last changed: $Date$</i>
 -->
-

temporal/t.remove/t.remove.py

@@ -53,12 +53,17 @@
 
 # %flag
 # % key: r
-# % description: Remove all registered maps from the temporal and also from the spatial database
+# % description: Remove stds and unregister maps from temporal database
 # %end
 
 # %flag
 # % key: f
-# % description: Force recursive removing
+# % description: Force removal (required for actual deletion of files)
+# %end
+
+# %flag
+# % key: d
+# % description: Remove stds, unregister maps from temporal database and delete them from mapset
 # %end
 
 import grass.script as grass
@@ -76,13 +81,7 @@ def main():
     type = options["type"]
     recursive = flags["r"]
     force = flags["f"]
-
-    if recursive and not force:
-        grass.fatal(
-            _(
-                "The recursive flag works only in conjunction with the force flag: use -rf"
-            )
-        )
+    clean = flags["d"]
 
     if datasets and file:
         grass.fatal(_("%s= and %s= are mutually exclusive") % ("input", "file"))
@@ -121,12 +120,30 @@ def main():
     # Create the pygrass Module object for g.remove
     remove = pyg.Module("g.remove", quiet=True, flags="f", run_=False)
 
+    if not force:
+        grass.message(_("The following data base element files will be deleted:"))
+
     for name in dataset_list:
         name = name.strip()
         sp = tgis.open_old_stds(name, type, dbif)
-
-        if recursive and force:
-            grass.message(_("Removing registered maps and %s" % type))
+        if not force:
+            grass.message(
+                _("{stds}: {gid}".format(stds=sp.get_type().upper(), gid=sp.get_id()))
+            )
+        if recursive or clean:
+            if not force:
+                if recursive:
+                    msg = (
+                        "The following maps of {stds} {gid} will be "
+                        "unregistered from temporal database:"
+                    )
+                elif clean:
+                    msg = (
+                        "The following maps of {stds} {gid} will be "
+                        "unregistered from temporal database and removed "
+                        "from spatial database:"
+                    )
+                grass.message(_(msg.format(stds=sp.get_type(), gid=sp.get_id())))
             maps = sp.get_registered_maps_as_objects(dbif=dbif)
             map_statement = ""
             count = 1
@@ -136,46 +153,51 @@ def main():
                 # We may have multiple layer for a single map, hence we need
                 # to avoid multiple deletation of the same map,
                 # but the database entries are still present and must be removed
-                if map.get_name() not in name_list:
-                    name_list.append(str(map.get_name()))
+                if not force:
+                    grass.message(_("- %s" % map.get_name()))
+                    continue
+                if clean and force:
+                    if map.get_name() not in name_list:
+                        name_list.append(str(map.get_name()))
                 map_statement += map.delete(dbif=dbif, execute=False)
 
                 count += 1
                 # Delete every 100 maps
                 if count % 100 == 0:
                     dbif.execute_transaction(map_statement)
-                    if type == "strds":
-                        remove(type="raster", name=name_list, run_=True)
-                    if type == "stvds":
-                        remove(type="vector", name=name_list, run_=True)
-                    if type == "str3ds":
-                        remove(type="raster_3d", name=name_list, run_=True)
+                    if clean:
+                        if type == "strds":
+                            remove(type="raster", name=name_list, run_=True)
+                        if type == "stvds":
+                            remove(type="vector", name=name_list, run_=True)
+                        if type == "str3ds":
+                            remove(type="raster_3d", name=name_list, run_=True)
                     map_statement = ""
                     name_list = []
 
             if map_statement:
                 dbif.execute_transaction(map_statement)
-            if name_list:
+            if clean and name_list:
                 if type == "strds":
                     remove(type="raster", name=name_list, run_=True)
                 if type == "stvds":
                     remove(type="vector", name=name_list, run_=True)
                 if type == "str3ds":
                     remove(type="raster_3d", name=name_list, run_=True)
-        else:
-            grass.message(
-                _(
-                    "Note: registered maps themselves have not been removed, only the %s"
-                    % type
-                )
-            )
-
-        statement += sp.delete(dbif=dbif, execute=False)
+        if force:
+            statement += sp.delete(dbif=dbif, execute=False)
 
-    # Execute the collected SQL statenents
-    dbif.execute_transaction(statement)
-
-    dbif.close()
+    if not force:
+        grass.message(
+            _(
+                "Nothing removed. You must use the force flag (-{flag}) to actually "
+                "remove them.".format(flag="f")
+            )
+        )
+    else:
+        # Execute the collected SQL statenents
+        dbif.execute_transaction(statement)
+        dbif.close()
 
 
 if __name__ == "__main__":

temporal/t.shift/testsuite/test_shift.py

@@ -51,7 +51,7 @@ class TestShiftAbsoluteSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1(self):
 
@@ -156,7 +156,7 @@ class TestShiftRelativeSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1(self):
 
@@ -210,7 +210,7 @@ class TestShiftAbsoluteSTR3DS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
 
     def test_1(self):
 
@@ -314,7 +314,7 @@ class TestShiftRelativeSTR3DS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
 
     def test_1(self):
 
@@ -369,7 +369,7 @@ class TestShiftAbsoluteSTVDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_1(self):
 
@@ -475,7 +475,7 @@ class TestShiftRelativeSTVDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_1(self):
 
@@ -530,7 +530,7 @@ class TestShiftAbsoluteError(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1(self):
         pass

temporal/t.snap/testsuite/test_snap.py

@@ -51,7 +51,7 @@ class TestSnapAbsoluteSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""
@@ -104,7 +104,7 @@ class TestSnapRelativeSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""
@@ -156,7 +156,7 @@ class TestSnapAbsoluteSTR3DS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""
@@ -209,7 +209,7 @@ class TestSnapRelativeSTR3DS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""
@@ -261,7 +261,7 @@ class TestSnapAbsoluteSTVDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""
@@ -314,7 +314,7 @@ class TestSnapRelativeSTVDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""

temporal/t.support/testsuite/test_support_str3ds.py

@@ -52,7 +52,7 @@ class TestSupportAbsoluteSTR3DS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="str3ds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="str3ds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""

temporal/t.support/testsuite/test_support_strds.py

@@ -52,7 +52,7 @@ class TestSupportAbsoluteSTRDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="strds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""

temporal/t.support/testsuite/test_support_stvds.py

@@ -52,7 +52,7 @@ class TestSupportAbsoluteSTVDS(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_1_metadata(self):
         """Set title, description and aggregation"""

temporal/t.vect.algebra/testsuite/test_vector_algebra.py

@@ -116,7 +116,7 @@ class TestTemporalVectorAlgebra(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.runModule(
-            "t.remove", flags="rf", inputs="A,B,C,D", type="stvds", quiet=True
+            "t.remove", flags="df", inputs="A,B,C,D", type="stvds", quiet=True
         )
         cls.del_temp_region()
 

temporal/t.vect.extract/testsuite/test_vect_extract.py

@@ -60,7 +60,7 @@ class TestVectorExtraction(TestCase):
     def tearDownClass(cls):
         """Remove the temporary region"""
         cls.del_temp_region()
-        cls.runModule("t.remove", flags="rf", type="stvds", inputs="A")
+        cls.runModule("t.remove", flags="df", type="stvds", inputs="A")
 
     def test_selection(self):
         """Perform a simple selection by datetime"""
@@ -96,7 +96,7 @@ class TestVectorExtraction(TestCase):
             overwrite=True,
         )
         self.assertVectorDoesNotExist("b_2001_07")
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="B")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="B")
 
     def test_selection_suffix(self):
         """Perform a simple selection by datetime"""
@@ -109,7 +109,7 @@ class TestVectorExtraction(TestCase):
             overwrite=True,
         )
         self.assertVectorDoesNotExist("b_2001_07")
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="B")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="B")
 
     def test_selection_time_suffix(self):
         """Perform a simple selection by datetime"""
@@ -123,7 +123,7 @@ class TestVectorExtraction(TestCase):
             overwrite=True,
         )
         self.assertVectorExists("b_2001_01_01T00_00_00")
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="B")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="B")
 
     def test_selection_num_suffix(self):
         """Perform a simple selection by datetime"""
@@ -137,7 +137,7 @@ class TestVectorExtraction(TestCase):
             overwrite=True,
         )
         self.assertVectorExists("b_00001")
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="B")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="B")
 
     def test_selection_num3_suffix(self):
         """Perform a simple selection by datetime"""
@@ -151,7 +151,7 @@ class TestVectorExtraction(TestCase):
             overwrite=True,
         )
         self.assertVectorExists("b_001")
-        self.runModule("t.remove", flags="rf", type="stvds", inputs="B")
+        self.runModule("t.remove", flags="df", type="stvds", inputs="B")
 
 
 if __name__ == "__main__":