Skip to content
Permalink
Browse files

Merge pull request #36118 from qgis-bot/backport-35984-to-release-3_12

[Backport release-3_12] [Server] WMS GetPrint group layers: use const list
  • Loading branch information
rldhont committed May 7, 2020
2 parents cd53939 + 7bc1152 commit 702700e42dac5a5e87b3a335c1e3f2025ee48fa4
Showing with 9 additions and 4 deletions.
  1. +9 −4 tests/src/python/test_qgsserver_wms_getprint.py
@@ -368,7 +368,10 @@ def test_wms_getprint_group(self):
"CRS": "EPSG:3857"
}.items())])

r_individual, _ = self._result(self._execute_request(qs))
r_individual, h = self._result(self._execute_request(qs))

# test reference image
self._img_diff_error(r_individual, h, "WMS_GetPrint_Group")

qs = "?" + "&".join(["%s=%s" % i for i in list({
"MAP": urllib.parse.quote(self.projectGroupsPath),
@@ -384,6 +387,9 @@ def test_wms_getprint_group(self):

r_group, h = self._result(self._execute_request(qs))

# Test group image
self._img_diff_error(r_group, h, "WMS_GetPrint_Group")

""" Debug check:
f = open('grouped.png', 'wb+')
f.write(r_group)
@@ -393,9 +399,8 @@ def test_wms_getprint_group(self):
f.close()
#"""

self.assertEqual(r_individual, r_group, 'Individual layers query and group layers query results should be identical')

self._img_diff_error(r_group, h, "WMS_GetPrint_Group")
# This test is too strict, it can fail
#self.assertEqual(r_individual, r_group, 'Individual layers query and group layers query results should be identical')

def test_wms_getprint_legend(self):
qs = "?" + "&".join(["%s=%s" % i for i in list({

0 comments on commit 702700e

Please sign in to comment.
You can’t perform that action at this time.