Merge pull request #5640 from pblottiere/wms_flaky

[server] WIP: detect WMS flaky tests
qgis · Nov 22, 2017 · 7e727fd · 7e727fd
2 parents 5945a84 + fd1539f
commit 7e727fd
Show file tree

Hide file tree

Showing 12 changed files with 1,746 additions and 1,598 deletions.
diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
@@ -233,6 +233,9 @@ IF (WITH_SERVER)
   ADD_PYTHON_TEST(PyQgsServer test_qgsserver.py)
   ADD_PYTHON_TEST(PyQgsServerPlugins test_qgsserver_plugins.py)
   ADD_PYTHON_TEST(PyQgsServerWMS test_qgsserver_wms.py)
+  ADD_PYTHON_TEST(PyQgsServerWMSGetMap test_qgsserver_wms_getmap.py)
+  ADD_PYTHON_TEST(PyQgsServerWMSGetLegendGraphic test_qgsserver_wms_getlegendgraphic.py)
+  ADD_PYTHON_TEST(PyQgsServerWMSGetPrint test_qgsserver_wms_getprint.py)
   ADD_PYTHON_TEST(PyQgsServerSettings test_qgsserver_settings.py)
   ADD_PYTHON_TEST(PyQgsServerProjectUtils test_qgsserver_projectutils.py)
   ADD_PYTHON_TEST(PyQgsServerSecurity test_qgsserver_security.py)

diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -180,7 +180,7 @@ def _img_diff(self, image, control_image, max_diff, max_size_diff=QSize()):
             control.setSizeTolerance(max_size_diff.width(), max_size_diff.height())
         return control.compareImages(control_image, max_diff), control.report()
 
-    def _img_diff_error(self, response, headers, image, max_diff=10, max_size_diff=QSize()):
+    def _img_diff_error(self, response, headers, image, max_diff=100, max_size_diff=QSize()):
         self.assertEqual(
             headers.get("Content-Type"), "image/png",
             "Content type is wrong: %s\n%s" % (headers.get("Content-Type"), response))