[GRASS-SVN] r74059 - in grass/trunk/temporal: t.rast.accdetect/testsuite t.rast.aggregate/testsuite t.rast.contour/testsuite t.rast.extract/testsuite t.rast.gapfill/testsuite t.rast.import/testsuite

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Feb 5 14:30:08 PST 2019


Author: sbl
Date: 2019-02-05 14:30:08 -0800 (Tue, 05 Feb 2019)
New Revision: 74059

Modified:
   grass/trunk/temporal/t.rast.accdetect/testsuite/test_simple.py
   grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
   grass/trunk/temporal/t.rast.contour/testsuite/test_convert.py
   grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py
   grass/trunk/temporal/t.rast.gapfill/testsuite/test_gapfill.py
   grass/trunk/temporal/t.rast.import/testsuite/test_temporal_rast_import.py
Log:
more t.info quote fixes; see #3746

Modified: grass/trunk/temporal/t.rast.accdetect/testsuite/test_simple.py
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/test_simple.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_simple.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -54,9 +54,9 @@
                           indicator="C", start="2001-01-01", cycle="12 months",
                           basename='result', range=(1,8))
         tinfo_string="""semantic_type=mean
-        start_time=2001-01-01 00:00:00
-        end_time=2009-05-01 00:00:00
-        granularity=1 month
+        start_time='2001-01-01 00:00:00'
+        end_time='2009-05-01 00:00:00'
+        granularity='1 month'
         map_time=interval
         number_of_maps=100"""
         info = SimpleModule("t.info", flags="g", type="strds", input="B")
@@ -64,9 +64,9 @@
                                   precision=2, sep="=")
 
         tinfo_string="""semantic_type=mean
-        start_time=2001-01-01 00:00:00
-        end_time=2009-05-01 00:00:00
-        granularity=1 month
+        start_time='2001-01-01 00:00:00'
+        end_time='2009-05-01 00:00:00'
+        granularity='1 month'
         map_time=interval
         number_of_maps=100"""
         info = SimpleModule("t.info", flags="g", type="strds", input="C")
@@ -78,9 +78,9 @@
                           indicator="C", start="2001-01-01", stop='2008-12-31',
                           cycle="12 months", basename='result', range=(1,8))
         tinfo_string="""semantic_type=mean
-        start_time=2001-01-01 00:00:00
-        end_time=2009-01-01 00:00:00
-        granularity=1 month
+        start_time='2001-01-01 00:00:00'
+        end_time='2009-01-01 00:00:00'
+        granularity='1 month'
         map_time=interval
         number_of_maps=96"""
         info = SimpleModule("t.info", flags="g", type="strds", input="B")
@@ -88,9 +88,9 @@
                                   precision=2, sep="=")
 
         tinfo_string="""semantic_type=mean
-        start_time=2001-01-01 00:00:00
-        end_time=2009-01-01 00:00:00
-        granularity=1 month
+        start_time='2001-01-01 00:00:00'
+        end_time='2009-01-01 00:00:00'
+        granularity='1 month'
         map_time=interval
         number_of_maps=96"""
         info = SimpleModule("t.info", flags="g", type="strds", input="C")

Modified: grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -60,9 +60,9 @@
                           sampling=["overlaps","overlapped","during"],
                           nprocs=2, flags="n")
 
-        tinfo_string="""start_time=2001-01-15 00:00:00
-                        end_time=2001-04-25 00:00:00
-                        granularity=2 days
+        tinfo_string="""start_time='2001-01-15 00:00:00'
+                        end_time='2001-04-25 00:00:00'
+                        granularity='2 days'
                         aggregation_type=average
                         number_of_maps=50
                         map_time=interval
@@ -84,9 +84,9 @@
                           method="maximum", sampling=["contains"],
                           file_limit=0, nprocs=3)
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='1 month'
                         map_time=interval
                         aggregation_type=maximum
                         number_of_maps=3
@@ -116,7 +116,8 @@
                           basename="b", granularity="1 months",
                           method="maximum", sampling=["contains"],
                           file_limit=0, nprocs=3, suffix='time')
-        self.assertRasterExists('b_2001_01_01T00_00_00')
+        #self.assertRasterExists('b_2001_01_01T00_00_00')
+        self.assertRasterExists('b_2001_01_01_00')
 
     def test_aggregation_2months(self):
         """Aggregation two month"""
@@ -125,9 +126,9 @@
                           method="minimum", sampling=["contains"],
                           nprocs=4, offset=10, suffix='num%02')
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-05-01 00:00:00
-                        granularity=2 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-05-01 00:00:00'
+                        granularity='2 months'
                         map_time=interval
                         aggregation_type=minimum
                         number_of_maps=2
@@ -158,9 +159,9 @@
                           file_limit=0, nprocs=9, offset=100,
                           suffix='num%03')
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         aggregation_type=sum
                         number_of_maps=1

Modified: grass/trunk/temporal/t.rast.contour/testsuite/test_convert.py
===================================================================
--- grass/trunk/temporal/t.rast.contour/testsuite/test_convert.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.contour/testsuite/test_convert.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -55,9 +55,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2002-04-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2002-04-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=5
                         lines=28
@@ -76,9 +76,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2002-01-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2002-01-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=4
                         lines=28
@@ -98,9 +98,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-04-01 00:00:00
-                        end_time=2002-01-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-04-01 00:00:00'
+                        end_time='2002-01-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=3
                         lines=21
@@ -119,9 +119,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2002-01-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2002-01-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=4
                         lines=28
@@ -140,9 +140,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2002-01-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2002-01-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=4
                         lines=28
@@ -162,9 +162,9 @@
 
         #self.assertModule("t.info",  type="stvds", flags="g",  input="result")
 
-        tinfo_string="""start_time=2001-04-01 00:00:00
-                        end_time=2002-01-01 00:00:00
-                        granularity=3 months
+        tinfo_string="""start_time='2001-04-01 00:00:00'
+                        end_time='2002-01-01 00:00:00'
+                        granularity='3 months'
                         map_time=interval
                         number_of_maps=3
                         lines=21

Modified: grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py
===================================================================
--- grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -71,9 +71,9 @@
 
         #self.assertModule("t.info",  flags="g",  input="precip_abs2")
 
-        tinfo_string="""start_time=2001-07-01 00:00:00
-        end_time=2002-07-01 00:00:00
-        granularity=3 months
+        tinfo_string="""start_time='2001-07-01 00:00:00'
+        end_time='2002-07-01 00:00:00'
+        granularity='3 months'
         map_time=interval
         north=80.0
         south=0.0
@@ -104,9 +104,9 @@
 
         #self.assertModule("t.info",  flags="g",  input="precip_abs2")
 
-        tinfo_string="""start_time=2002-01-01 00:00:00
-        end_time=2002-07-01 00:00:00
-        granularity=3 months
+        tinfo_string="""start_time='2002-01-01 00:00:00'
+        end_time='2002-07-01 00:00:00'
+        granularity='3 months'
         map_time=interval
         north=80.0
         south=0.0
@@ -136,9 +136,9 @@
 
         #self.assertModule("t.info",  flags="g",  input="precip_abs2")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-        end_time=2002-07-01 00:00:00
-        granularity=3 months
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+        end_time='2002-07-01 00:00:00'
+        granularity='3 months'
         map_time=interval
         north=80.0
         south=0.0

Modified: grass/trunk/temporal/t.rast.gapfill/testsuite/test_gapfill.py
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/testsuite/test_gapfill.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.gapfill/testsuite/test_gapfill.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -56,9 +56,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=12
                                 min_min=100.0
@@ -94,9 +94,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=10
                                 min_min=100.0
@@ -129,9 +129,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=5
                                 min_min=100.0
@@ -159,9 +159,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=3
                                 min_min=100.0
@@ -187,9 +187,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=12
                                 min_min=100.0
@@ -225,9 +225,9 @@
 
         #self.assertModule("t.info",  type="strds", flags="g",  input="A")
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                                end_time=2002-01-01 00:00:00
-                                granularity=1 month
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                                end_time='2002-01-01 00:00:00'
+                                granularity='1 month'
                                 map_time=interval
                                 number_of_maps=12
                                 min_min=100.0

Modified: grass/trunk/temporal/t.rast.import/testsuite/test_temporal_rast_import.py
===================================================================
--- grass/trunk/temporal/t.rast.import/testsuite/test_temporal_rast_import.py	2019-02-05 12:10:00 UTC (rev 74058)
+++ grass/trunk/temporal/t.rast.import/testsuite/test_temporal_rast_import.py	2019-02-05 22:30:08 UTC (rev 74059)
@@ -32,9 +32,9 @@
     def test_import(self):
         self.assertModule("t.rast.import", input=self.input_, output="A", 
                           basename="a", overwrite=True)
-        tinfo = """start_time=2000-01-01 00:00:00
-                   end_time=2001-01-01 00:00:00
-                   granularity=1 month
+        tinfo = """start_time='2000-01-01 00:00:00'
+                   end_time='2001-01-01 00:00:00'
+                   granularity='1 month'
                    map_time=interval
                    north=320000.0
                    south=10000.0
@@ -44,4 +44,4 @@
                 
         info = SimpleModule("t.info", flags="g", input="A")
         self.assertModuleKeyValue(module=info, reference=tinfo,
-                                  precision=2, sep="=")
\ No newline at end of file
+                                  precision=2, sep="=")



More information about the grass-commit mailing list