src/core/qgsrenderchecker.cpp

@@ -352,7 +352,7 @@ bool QgsRenderChecker::compareImages( QString theTestName,
   //
   // Send match result to debug
   //
-  qDebug( "%d/%d pixels mismatched", mMismatchCount, mMatchTarget );
+  qDebug( "%d/%d pixels mismatched (%d allowed)", mMismatchCount, mMatchTarget, theMismatchCount );
 
   //
   // Send match result to report

tests/src/python/qgis_local_server.py

@@ -26,6 +26,7 @@
 
 from utilities import (
     unitTestDataPath,
+    getExecutablePath,
     openInBrowserTab
 )
 
@@ -235,7 +236,7 @@ def __init__(self, kind, exe, fcgi_bin, conf_dir, temp_dir):
                 pass
 
 
-# noinspection PyPep8Naming
+# noinspection PyPep8Naming,PyShadowingNames
 class QgisLocalServer(object):
 
     def __init__(self, fcgi_bin):
@@ -268,8 +269,8 @@ def __init__(self, fcgi_bin):
 
         chkd = ''
         for fcgi, web in servers:
-            fcgi_path = self._exe_path(fcgi)
-            web_path = self._exe_path(web)
+            fcgi_path = getExecutablePath(fcgi)
+            web_path = getExecutablePath(web)
             if fcgi_path and web_path:
                 self._fcgiserv_path = fcgi_path
                 self._webserv_path = web_path
@@ -612,6 +613,7 @@ def _open_fs_item(item):
         else:  # ?
             pass
 
+
 # noinspection PyPep8Naming
 def getLocalServer():
     """ Start a local test server controller that independently manages Web and