Skip to content

Commit f6710de

Browse files
Médéric RibreuxMédéric RIBREUX
Médéric Ribreux
authored and
Médéric RIBREUX
committedMay 29, 2016
Fix rasterhashes value with osgeo4travis values
·
ltr-3_40archive/master_2
1 parent 1945fac commit f6710de

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed
 

‎python/plugins/processing/algs/grass7/Grass7Utils.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ def executeGrass7(commands, progress, outputCommands=None):
261261
loglines.append(Grass7Utils.tr('GRASS GIS 7 execution console output'))
262262
grassOutDone = False
263263
command, grassenv = Grass7Utils.prepareGrass7Execution(commands)
264-
print('Debug: executeGrass7\n---------------\ncommands: {}\n\ncommand: {}\n\nenv: {}'.format(commands, command, grassenv))
265264
proc = subprocess.Popen(
266265
command,
267266
shell=True,
@@ -272,7 +271,6 @@ def executeGrass7(commands, progress, outputCommands=None):
272271
env=grassenv
273272
).stdout
274273
for line in iter(proc.readline, ''):
275-
print(line)
276274
if 'GRASS_INFO_PERCENT' in line:
277275
try:
278276
progress.setPercentage(int(line[len('GRASS_INFO_PERCENT') + 2:]))
@@ -292,8 +290,6 @@ def executeGrass7(commands, progress, outputCommands=None):
292290

293291
if not grassOutDone and outputCommands:
294292
command, grassenv = Grass7Utils.prepareGrass7Execution(outputCommands)
295-
print('Debug: executeGrass7 outputCommands\n=============\ncommands: {}\n\ncommand: {}\n\nenv: {}'.format(commands, command, grassenv))
296-
297293
proc = subprocess.Popen(
298294
command,
299295
shell=True,
@@ -304,7 +300,6 @@ def executeGrass7(commands, progress, outputCommands=None):
304300
env=grassenv
305301
).stdout
306302
for line in iter(proc.readline, ''):
307-
print(line)
308303
if 'GRASS_INFO_PERCENT' in line:
309304
try:
310305
progress.setPercentage(int(

‎python/plugins/processing/tests/testdata/grass7_algorithm_tests.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tests:
1212
results:
1313
output:
1414
type: rasterhash
15-
hash: 0850127d19d5098ff7cc7bb5991b7881d792e4a64aed42b811cb031b
15+
hash: 80fe9e022cff3d4cad57fbad40aa7f547b3621a4eec94629d69e16ed
1616

1717
- algorithm: grass7:i.biomass
1818
name: GRASS7 i.biomass
@@ -38,7 +38,7 @@ tests:
3838
type: raster
3939
results:
4040
output:
41-
hash: 2359a7d0db659ea48272248e663ead0b9cb11e6e97b3fcb14db8bd95
41+
hash: edbbf2a0866a2fdfa01996d5bef5a06862df2a54c020fc8b1e4aa51a
4242
type: rasterhash
4343

4444
- algorithm: grass7:i.eb.eta
@@ -56,7 +56,7 @@ tests:
5656
type: raster
5757
results:
5858
output:
59-
hash: ea1b463ce6d426eb3b6d40dbd5b475a010bede837f5a3e3faf3dfb40
59+
hash: 5143d76a4d32395f4cfaf22aab33c5ae47f2c219eebbb888663a4e85
6060
type: rasterhash
6161

6262
- algorithm: grass7:i.eb.netrad
@@ -92,7 +92,7 @@ tests:
9292
type: raster
9393
results:
9494
output:
95-
hash: d6fc0efa1ebff447b8b04a1bd222acd9e37b1aa3a655ad5b1d69a49f
95+
hash: b38052d5d446aad62dfe46c84d0fb949b9ba0b6f43aa7c95e3de2c92
9696
type: rasterhash
9797

9898
- algorithm: grass7:i.eb.soilheatflux
@@ -117,7 +117,7 @@ tests:
117117
type: raster
118118
results:
119119
output:
120-
hash: b8a09be667e73465a3d06e3c1a1d99a8663f21be1918f498e7b49eca
120+
hash: aa195846f7a93d4141c01170751afad055ab6d1caa74cc888c4ad398
121121
type: rasterhash
122122

123123
- algorithm: grass7:i.evapo.mh
@@ -139,7 +139,7 @@ tests:
139139
type: raster
140140
results:
141141
output:
142-
hash: 182223a6c8da7b51118794de826c0bc53f288f377351d62aecc63837
142+
hash: 9bdbd441804b613f0fdb2449572b69fdc3431113810330693c45b87f
143143
type: rasterhash
144144

145145
- algorithm: grass7:i.evapo.pm
@@ -166,7 +166,7 @@ tests:
166166
type: raster
167167
results:
168168
output:
169-
hash: 53ad3d55bb9593decb21a6ee10802dd79a42cb17f067ce38ac286ab2
169+
hash: 7d649cefbf6b0d5581c9cafb285c0598827198fd6f313909325979d7
170170
type: rasterhash
171171

172172
- algorithm: grass7:i.evapo.pt
@@ -188,7 +188,7 @@ tests:
188188
type: raster
189189
results:
190190
output:
191-
hash: 182223a6c8da7b51118794de826c0bc53f288f377351d62aecc63837
191+
hash: 9bdbd441804b613f0fdb2449572b69fdc3431113810330693c45b87f
192192
type: rasterhash
193193

194194
- algorithm: grass7:i.topo.coor.ill
@@ -202,7 +202,7 @@ tests:
202202
zenith: 50
203203
results:
204204
output:
205-
hash: d3da5e4b9d088760d01d70de956d2cd35433c96d175ca68394d4dee8
205+
hash: d1eb7882b3d68f2bc5785dc052b1c870d84e9a232b72607ca4d7da45
206206
type: rasterhash
207207

208208
- algorithm: grass7:i.vi
@@ -219,7 +219,7 @@ tests:
219219
viname: 10
220220
results:
221221
output:
222-
hash: 182223a6c8da7b51118794de826c0bc53f288f377351d62aecc63837
222+
hash: 9bdbd441804b613f0fdb2449572b69fdc3431113810330693c45b87f
223223
type: rasterhash
224224

225225
- algorithm: grass7:i.zc
@@ -323,7 +323,7 @@ tests:
323323
type: raster
324324
results:
325325
imaginary:
326-
hash: 94249384dd8b6019f0024501bc9a093cba9dd025c183d3fb46d77027
326+
hash: 0a64ae8d6ba603cbedeee7706df0942f4d7221e394bc76939f33a3dc
327327
type: rasterhash
328328
real:
329329
hash: 09ab93c65aa2dde4da422b62a5ed3e38208e2da072cec2b0eb837a47
@@ -350,7 +350,7 @@ tests:
350350
threshold: 0.5
351351
results:
352352
goodness:
353-
hash: 5cb3cc31a68c03ea76578559b04ffa5f81331a4232abb38d09b29ea4
353+
hash: 597d8962276c360ef1efc0b8647c3bd773b5e98898d4e56a2d82928f
354354
type: rasterhash
355355
output:
356356
hash: b65992a5d48b867d4a32a533f38e7a72cb1ba18f1e261c6be132baca
@@ -434,13 +434,13 @@ tests:
434434
type: raster
435435
results:
436436
blueoutput:
437-
hash: b8f6f6d11751ec26eb93daed87611e473efe6146ad3e84bce13c3393
437+
hash: 75bac89afee968cd5d7027de1acfff3b02a7517eb136f3b73e49b2fa
438438
type: rasterhash
439439
greenoutput:
440-
hash: 522356ef99242f7be6ad65c23af9148f5a807deca89c1efec1db38c1
440+
hash: e11274dddcd5f169f03957f41ece1fde7625b8ace342de258ba2873b
441441
type: rasterhash
442442
redoutput:
443-
hash: c6b99e12c2eab3016bbf8d15888c353c3fdb1b84674deac78e3e2bfc
443+
hash: 9fc943dcf4fcead4f2c662bb6e3f0455caed5df1d9f46ae763955001
444444
type: rasterhash
445445

446446
- algorithm: grass7:i.smap
@@ -538,7 +538,7 @@ tests:
538538
vapourpressureactual: 1.511
539539
results:
540540
output:
541-
hash: 2706c64a65a6a603857937554a5e8787a1429e1ca6b8551b0dea7b8f
541+
hash: 10a7144d393e716f721265057d1d1603baa627ceb7c6b29e30865a58
542542
type: rasterhash
543543

544544
- algorithm: grass7:i.modis.qc
@@ -597,7 +597,7 @@ tests:
597597
vapourpressureactual: 1.511
598598
results:
599599
output:
600-
hash: f564acd642f6f0ea76cbe55d3565d083e055d2e81dde97365f786bad
600+
hash: 77e31601b511602b998168f715756a87a3735b07131a99b27e2de241
601601
type: rasterhash
602602

603603
- algorithm: grass7:i.atcorr
@@ -615,5 +615,5 @@ tests:
615615
name: custom/grass7/i.atcorr.txt
616616
results:
617617
output:
618-
hash: fc3dbc04793ecba0a24400d489f3ebd0660400232602487e6861306c
618+
hash: 46dea0dc5e5a3fed82aed98aa1cb6fe82deb8f1ac0347e930d4bbbeb
619619
type: rasterhash

0 commit comments

Comments
 (0)
Please sign in to comment.