Server labeling test fixes

Author: nyalldawson

src/server/CMakeLists.txt

@@ -10,6 +10,10 @@ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   ADD_DEFINITIONS(-DQGSMSDEBUG=1)
 ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
+IF (ENABLE_TESTS)
+   ADD_DEFINITIONS(-DENABLE_MS_TESTS=1)
+ENDIF (ENABLE_TESTS)
+
 ########################################################
 # Files
 

src/server/qgis_map_serv.cpp

@@ -313,7 +313,7 @@ int main( int argc, char * argv[] )
   QScopedPointer< QgsMapRenderer > theMapRenderer( new QgsMapRenderer );
   theMapRenderer->setLabelingEngine( new QgsPalLabeling() );
 
-#ifdef QGSMSDEBUG
+#ifdef ENABLE_MS_TESTS
   QgsFontUtils::loadStandardTestFonts( QStringList() << "Roman" << "Bold" );
 #endif
 

tests/src/python/test_qgis_local_server.py

@@ -117,7 +117,7 @@ def test_getmap(self):
         # chk.setMapRenderer(None)
         res = chk.compareImages(test_name, 0, str(img_path))
         if QGIS_TEST_REPORT and not res:  # don't report ok checks
-            TESTREPORTS[test_name] = str(chk.report().toLocal8Bit())
+            TESTREPORTS[test_name] = chk.report()
         msg = '\nRender check failed for "{0}"'.format(test_name)
         assert res, msg
 

tests/src/python/test_qgspallabeling_base.py

@@ -363,7 +363,7 @@ def renderCheck(self, mismatch=0, colortol=0, imgpath='', grpprefix=''):
         res = chk.runTest(self._Test, mismatch)
         if PALREPORT and not res:  # don't report ok checks
             testname = self._TestGroup + ' . ' + self._Test
-            PALREPORTS[testname] = str(chk.report().toLocal8Bit())
+            PALREPORTS[testname] = chk.report()
         msg = '\nRender check failed for "{0}"'.format(self._Test)
         return res, msg