[GRASS-SVN] r74073 - in grass/trunk/temporal: t.rast.aggregate/testsuite t.rast.series/testsuite t.rast.to.vect/testsuite t.vect.extract/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Feb 9 13:45:58 PST 2019
Author: sbl
Date: 2019-02-09 13:45:58 -0800 (Sat, 09 Feb 2019)
New Revision: 74073
Modified:
grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
grass/trunk/temporal/t.rast.series/testsuite/test_series.py
grass/trunk/temporal/t.rast.to.vect/testsuite/test_to_vect.py
grass/trunk/temporal/t.vect.extract/testsuite/test_vect_extract.py
Log:
add quotes around t.info strings; see #3746
Modified: grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py 2019-02-09 17:51:40 UTC (rev 74072)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py 2019-02-09 21:45:58 UTC (rev 74073)
@@ -61,9 +61,9 @@
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 @@
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 @@
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 @@
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
Modified: grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py 2019-02-09 17:51:40 UTC (rev 74072)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py 2019-02-09 21:45:58 UTC (rev 74073)
@@ -59,8 +59,8 @@
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 @@
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 @@
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 @@
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
Modified: grass/trunk/temporal/t.rast.series/testsuite/test_series.py
===================================================================
--- grass/trunk/temporal/t.rast.series/testsuite/test_series.py 2019-02-09 17:51:40 UTC (rev 74072)
+++ grass/trunk/temporal/t.rast.series/testsuite/test_series.py 2019-02-09 21:45:58 UTC (rev 74073)
@@ -58,8 +58,8 @@
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="=")
Modified: grass/trunk/temporal/t.rast.to.vect/testsuite/test_to_vect.py
===================================================================
--- grass/trunk/temporal/t.rast.to.vect/testsuite/test_to_vect.py 2019-02-09 17:51:40 UTC (rev 74072)
+++ grass/trunk/temporal/t.rast.to.vect/testsuite/test_to_vect.py 2019-02-09 21:45:58 UTC (rev 74073)
@@ -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
points=384
@@ -74,9 +74,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
boundaries=4
@@ -98,9 +98,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
boundaries=4
@@ -121,9 +121,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'
number_of_maps=4
points=384
primitives=384"""
Modified: grass/trunk/temporal/t.vect.extract/testsuite/test_vect_extract.py
===================================================================
--- grass/trunk/temporal/t.vect.extract/testsuite/test_vect_extract.py 2019-02-09 17:51:40 UTC (rev 74072)
+++ grass/trunk/temporal/t.vect.extract/testsuite/test_vect_extract.py 2019-02-09 21:45:58 UTC (rev 74073)
@@ -50,9 +50,9 @@
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
More information about the grass-commit
mailing list