Quellcode durchsuchen

testsuite: g.remove (and likely also t.remove) require -f flag

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@66722 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler vor 9 Jahren
Ursprung
Commit
3e4b8aa91c

+ 3 - 3
raster/r.univar/testsuite/test_r_univar.py

@@ -19,9 +19,9 @@ class TestRasterUnivar(TestCase):
 
 
     def tearDown(self):
     def tearDown(self):
     	pass
     	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):
     def setUp(self):
         """Create input data
         """Create input data

+ 3 - 3
scripts/v.rast.stats/testsuite/test_v_rast_stats.py

@@ -20,9 +20,9 @@ class TestRastStats(TestCase):
 
 
     def tearDown(self):
     def tearDown(self):
     	pass
     	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):
     def setUp(self):
         """Create input data
         """Create input data

+ 2 - 2
temporal/t.unregister/testsuite/test_unregister.py

@@ -59,7 +59,7 @@ class TestUnregister(TestCase):
 
 
     def tearDown(self):
     def tearDown(self):
         """Remove generated data"""
         """Remove generated data"""
-        self.runModule("g.remove", type="raster",  
+        self.runModule("g.remove", flags='f', type="raster",  
                                    name="a1,a2,a3,a4,a5,a6")
                                    name="a1,a2,a3,a4,a5,a6")
 
 
     def test_1(self):
     def test_1(self):
@@ -117,7 +117,7 @@ class TestUnregister(TestCase):
         self.assertEqual(a456, lister.outputs.stdout)
         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")
         self.assertModule("t.remove",  type="strds", inputs="A,B")
 
 
         lister = SimpleModule("t.list", type="raster", columns="name", 
         lister = SimpleModule("t.list", type="raster", columns="name",