[GRASS-SVN] r66722 - in grass/trunk: raster/r.univar/testsuite scripts/v.rast.stats/testsuite temporal/t.unregister/testsuite

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-11-03 01:30:41 -0800 (Tue, 03 Nov 2015)
New Revision: 66722

Modified:
   grass/trunk/raster/r.univar/testsuite/test_r_univar.py
   grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py
   grass/trunk/temporal/t.unregister/testsuite/test_unregister.py
Log:
testsuite: g.remove (and likely also t.remove) require -f flag

Modified: grass/trunk/raster/r.univar/testsuite/test_r_univar.py
===================================================================
--- grass/trunk/raster/r.univar/testsuite/test_r_univar.py	2015-11-03 08:46:17 UTC (rev 66721)
+++ grass/trunk/raster/r.univar/testsuite/test_r_univar.py	2015-11-03 09:30:41 UTC (rev 66722)
@@ -19,9 +19,9 @@
 
     def tearDown(self):
     	pass
-        self.runModule("g.remove", type="raster", name="map_a")
-        self.runModule("g.remove", type="raster", name="map_b")
-        self.runModule("g.remove", type="raster", name="zone_map")
+        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="zone_map")
 
     def setUp(self):
         """Create input data

Modified: grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py	2015-11-03 08:46:17 UTC (rev 66721)
+++ grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py	2015-11-03 09:30:41 UTC (rev 66722)
@@ -20,9 +20,9 @@
 
     def tearDown(self):
     	pass
-        self.runModule("g.remove", type="raster", name="map_a")
-        self.runModule("g.remove", type="raster", name="map_b")
-        self.runModule("g.remove", type="raster", name="zone_map")
+        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="zone_map")
 
     def setUp(self):
         """Create input data

Modified: grass/trunk/temporal/t.unregister/testsuite/test_unregister.py
===================================================================
--- grass/trunk/temporal/t.unregister/testsuite/test_unregister.py	2015-11-03 08:46:17 UTC (rev 66721)
+++ grass/trunk/temporal/t.unregister/testsuite/test_unregister.py	2015-11-03 09:30:41 UTC (rev 66722)
@@ -59,7 +59,7 @@
 
     def tearDown(self):
         """Remove generated data"""
-        self.runModule("g.remove", type="raster",  
+        self.runModule("g.remove", flags='f', type="raster",  
                                    name="a1,a2,a3,a4,a5,a6")
 
     def test_1(self):
@@ -117,7 +117,7 @@
         self.assertEqual(a456, lister.outputs.stdout)
 
 
-        # Remove STRDS A and B and chceck if maps a4, a5 and a6 are still in the temporal database
+        # Remove STRDS A and B and check if maps a4, a5 and a6 are still in the temporal database
         self.assertModule("t.remove",  type="strds", inputs="A,B")
 
         lister = SimpleModule("t.list", type="raster", columns="name",