Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-3_12] [Server] WMS GetPrint group layers: use const list #36118

Merged
merged 1 commit into from May 7, 2020
Merged

[Backport release-3_12] [Server] WMS GetPrint group layers: use const list #36118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions tests/src/python/test_qgsserver_wms_getprint.py
View file
Open in desktop
Expand Up @@ -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),
Expand All @@ -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)
Expand All @@ -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({
Expand Down