Skip to content

Commit a12152c

Browse files
authoredJun 29, 2016
Merge pull request #3238 from medspx/processing_g7_raster_tests
[processing] more grass7 unit tests and their fixes
2 parents 0f6e8da + ef4a0d8 commit a12152c

File tree

86 files changed

+2484
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2484
-106
lines changed
 

‎ci/travis/linux/qt5/blacklist.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ PyQgsVirtualLayerDefinition
1313
PyQgsVirtualLayerProvider
1414
qgis_composermapgridtest
1515
qgis_composerutils
16-
ProcessingGrass7AlgorithmsTest
16+
ProcessingGrass7AlgorithmsImageryTest
17+
ProcessingGrass7AlgorithmsRasterTest

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,6 @@ def processOutputs(self):
472472
self.commands.append(command)
473473
self.outputCommands.append(command)
474474

475-
command = 'r.out.gdal --overwrite -c createopt="TFW=YES,COMPRESS=LZW"'
476-
command += ' input='
477-
command += 'correctedoutput' + self.uniqueSufix
478-
command += ' output="' + filename + '"'
479-
elif self.grass7Name == 'r.composite':
480475
command = 'r.out.gdal --overwrite -c createopt="TFW=YES,COMPRESS=LZW"'
481476
command += ' input='
482477
command += 'correctedoutput' + self.uniqueSufix
@@ -487,9 +482,6 @@ def processOutputs(self):
487482

488483
if self.grass7Name == 'r.horizon':
489484
command += out.name + self.uniqueSufix + '_0'
490-
elif self.grass7Name == 'r.composite':
491-
self.commands.append(command)
492-
self.outputCommands.append(command)
493485
elif self.grass7Name == 'r.statistics':
494486
self.commands.append(command)
495487
self.outputCommands.append(command)

0 commit comments

Comments
 (0)
Please sign in to comment.