Fix some failing tests

qgis · May 6, 2014 · 6cf3003 · 6cf3003
1 parent b9f5477
commit 6cf3003
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -116,6 +116,7 @@ void TestQgsAtlasComposition::initTestCase()
 
   mAtlas = &mComposition->atlasComposition();
   mAtlas->setCoverageLayer( mVectorLayer );
+  mAtlas->setEnabled( true );
   mComposition->setAtlasMode( QgsComposition::ExportAtlas );
 
   // an overview

diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
@@ -217,7 +217,7 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
   QgsRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );
-  bool myResultFlag = myChecker.runTest( theTestType );
+  bool myResultFlag = myChecker.runTest( theTestType, 1500 );
   mReport += myChecker.report();
   return myResultFlag;
 }

diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp
@@ -128,7 +128,7 @@ void TestQgsComposerPaper::markerLinePaper()
 {
   mComposition->setPageStyleSymbol( mMarkerLineSymbol );
   QgsCompositionChecker checker( "composerpaper_markerborder", mComposition );
-  QVERIFY( checker.testComposition( mReport ) );
+  QVERIFY( checker.testComposition( mReport, 0, 60 ) );
 }
 
 QTEST_MAIN( TestQgsComposerPaper )

diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
@@ -63,6 +63,7 @@ def testCase(self):
         # the atlas
         self.mAtlas = self.mComposition.atlasComposition()
         self.mAtlas.setCoverageLayer( mVectorLayer )
+        self.mAtlas.setEnabled( True )
         self.mComposition.setAtlasMode( QgsComposition.ExportAtlas )
 
         # an overview

diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py
@@ -116,7 +116,7 @@ def testVectorBlending(self):
         checker.setControlName("expected_vector_blendmodes")
         checker.setMapSettings(self.mapSettings)
 
-        myResult = checker.runTest("vector_blendmodes");
+        myResult = checker.runTest("vector_blendmodes", 1500);
         myMessage = ('vector blending failed')
         assert myResult, myMessage
 
@@ -141,7 +141,7 @@ def testVectorFeatureBlending(self):
         checker.setControlName("expected_vector_featureblendmodes")
         checker.setMapSettings(self.mapSettings)
 
-        myResult = checker.runTest("vector_featureblendmodes");
+        myResult = checker.runTest("vector_featureblendmodes", 1500);
         myMessage = ('vector feature blending failed')
         assert myResult, myMessage
 
@@ -165,7 +165,7 @@ def testVectorLayerTransparency(self):
         checker.setControlName("expected_vector_layertransparency")
         checker.setMapSettings(self.mapSettings)
 
-        myResult = checker.runTest("vector_layertransparency");
+        myResult = checker.runTest("vector_layertransparency", 1500);
         myMessage = ('vector layer transparency failed')
         assert myResult, myMessage
 
@@ -184,7 +184,7 @@ def testRasterBlending(self):
         checker.setControlName("expected_raster_blendmodes")
         checker.setMapSettings(self.mapSettings)
 
-        myResult = checker.runTest("raster_blendmodes");
+        myResult = checker.runTest("raster_blendmodes", 1500);
         myMessage = ('raster blending failed')
         assert myResult, myMessage