Browse Source

add quotes around t.info strings; see https://trac.osgeo.org/grass/ticket/3746

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74073 15284696-431f-4ddb-bdfa-cd5b030d7da7
Stefan Blumentrath 6 years ago
parent
commit
aec00b48dd

+ 12 - 12
temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py

@@ -61,9 +61,9 @@ class TestAggregationAbsoluteParallel(TestCase):
                           method="sum", sampling=["contains"],
                           nprocs=9, file_limit=2)
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=12 hours
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='12 hours'
                         map_time=interval
                         aggregation_type=sum
                         number_of_maps=180
@@ -90,9 +90,9 @@ class TestAggregationAbsoluteParallel(TestCase):
         delta = end - start
         print("test_aggregation_1day_4procs:",  delta.total_seconds())
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=1 day
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='1 day'
                         map_time=interval
                         aggregation_type=sum
                         number_of_maps=90"""
@@ -116,9 +116,9 @@ class TestAggregationAbsoluteParallel(TestCase):
         print("test_aggregation_1day_3procs:",  delta.total_seconds())
 
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=1 day
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='1 day'
                         map_time=interval
                         aggregation_type=sum
                         number_of_maps=90
@@ -146,9 +146,9 @@ class TestAggregationAbsoluteParallel(TestCase):
         print("test_aggregation_1day_2procs:",  delta.total_seconds())
 
 
-        tinfo_string="""start_time=2001-01-01 00:00:00
-                        end_time=2001-04-01 00:00:00
-                        granularity=1 day
+        tinfo_string="""start_time='2001-01-01 00:00:00'
+                        end_time='2001-04-01 00:00:00'
+                        granularity='1 day'
                         map_time=interval
                         aggregation_type=sum
                         number_of_maps=90

+ 8 - 8
temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py

@@ -59,8 +59,8 @@ class TestAggregationRelative(TestCase):
                           sampling=["overlaps","overlapped","contains"],
                           nprocs=2, verbose=True)
 
-        tinfo_string="""start_time=0
-                        end_time=18
+        tinfo_string="""start_time='0'
+                        end_time='18'
                         unit=days
                         granularity=6
                         map_time=interval
@@ -86,8 +86,8 @@ class TestAggregationRelative(TestCase):
                           nprocs=4, flags="n", verbose=True)
 
         tinfo_string="""semantic_type=mean
-                        start_time=0
-                        end_time=27
+                        start_time='0'
+                        end_time='27'
                         unit=days
                         granularity=9
                         map_time=interval
@@ -113,8 +113,8 @@ class TestAggregationRelative(TestCase):
                           nprocs=4, verbose=True)
 
         tinfo_string="""semantic_type=mean
-                        start_time=0
-                        end_time=18
+                        start_time='0'
+                        end_time='18'
                         unit=days
                         granularity=9
                         map_time=interval
@@ -140,8 +140,8 @@ class TestAggregationRelative(TestCase):
                           nprocs=4, verbose=True)
 
         tinfo_string="""semantic_type=mean
-                        start_time=0
-                        end_time=21
+                        start_time='0'
+                        end_time='21'
                         unit=days
                         granularity=21
                         map_time=interval

+ 2 - 2
temporal/t.rast.series/testsuite/test_series.py

@@ -58,8 +58,8 @@ class TestSnapAbsoluteSTRDS(TestCase):
         self.assertModule("t.rast.series", input="A", method="average",
                           output="series_time_stamp", where="start_time > '2001-02-01'")
 
-        tinfo_string="""start_time=2001-02-01 00:00:00
-                        end_time=2001-05-01 00:00:00"""
+        tinfo_string="""start_time='2001-02-01 00:00:00'
+                        end_time='2001-05-01 00:00:00'"""
 
         info = SimpleModule("t.info", flags="g", type="raster", input="series_time_stamp")
         self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")

+ 12 - 12
temporal/t.rast.to.vect/testsuite/test_to_vect.py

@@ -55,9 +55,9 @@ class TestRasterToVector(TestCase):
 
         #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
                         points=384
@@ -74,9 +74,9 @@ class TestRasterToVector(TestCase):
                           
         #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
                         boundaries=4
@@ -98,9 +98,9 @@ class TestRasterToVector(TestCase):
                           
         #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
                         boundaries=4
@@ -121,9 +121,9 @@ class TestRasterToVector(TestCase):
 
         #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'
                         number_of_maps=4
                         points=384
                         primitives=384"""

+ 3 - 3
temporal/t.vect.extract/testsuite/test_vect_extract.py

@@ -50,9 +50,9 @@ class TestVectorExtraction(TestCase):
         self.assertModule("t.vect.extract", input="A", output="B", 
                           where="start_time > '2001-06-01'", overwrite=True)
 
-        tinfo_string="""start_time=2001-07-01 00:00:00
-        end_time=2003-07-01 00:00:00
-        granularity=3 months
+        tinfo_string="""start_time='2001-07-01 00:00:00'
+        end_time='2003-07-01 00:00:00'
+        granularity='3 months'
         map_time=interval
         number_of_maps=8
         primitives=160