Skip to content

Commit

Permalink
Python - Upgrade test folder to Python 3.7 minimum
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gustry @nyalldawson
Gustry authored and nyalldawson committed Apr 18, 2023
1 parent 121f46a commit cf77ddb
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 29 deletions.
2 changes: 1 addition & 1 deletion tests/src/python/test_provider_gdal.py
View file
Expand Up @@ -312,7 +312,7 @@ def testInt8(self):
def testGdbMetadata(self):
"""Test reading GDB layer metadata"""
path = os.path.join(unitTestDataPath(), 'raster_metadata.gdb')
rl = QgsRasterLayer('OpenFileGDB:{}:int'.format(path), 'gdb', 'gdal')
rl = QgsRasterLayer(f'OpenFileGDB:{path}:int', 'gdb', 'gdal')
self.assertTrue(rl.isValid())

self.assertEqual(rl.metadata().identifier(), 'int')
Expand Down
37 changes: 18 additions & 19 deletions tests/src/python/test_qgsserver_wms_getlegendgraphic.py
View file
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
"""QGIS Unit tests for QgsServer WMS GetLegendGraphic.
From build dir, run: ctest -R PyQgsServerWMSGetLegendGraphic -V
Expand Down Expand Up @@ -68,10 +67,10 @@ def test_getLegendGraphics(self):
# 'HEIGHT': '20', # optional
'LAYER': 'testlayer%20èé',
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
h, r = self._execute_request(qs)
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), f"Header: {h}\nResponse:\n{r}")
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), f"Header: {h}\nResponse:\n{r}")

def test_wms_GetLegendGraphic_LayerSpace(self):
qs = "?" + "&".join(["%s=%s" % i for i in list({
Expand Down Expand Up @@ -190,7 +189,7 @@ def test_wms_getLegendGraphics_layertitle(self):
'LAYERTITLE': 'TRUE',
'RULELABEL': 'TRUE'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15))

Expand All @@ -211,7 +210,7 @@ def test_wms_getLegendGraphics_layertitle(self):
'ITEMFONTSIZE': '20',
'ITEMFONTFAMILY': self.fontFamily
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))

self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15))
Expand All @@ -228,7 +227,7 @@ def test_wms_getLegendGraphics_layertitle(self):
'LAYERTITLE': 'FALSE',
'RULELABEL': 'FALSE'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_test_layertitle_false", 250, QSize(15, 15))

Expand All @@ -249,7 +248,7 @@ def test_wms_getLegendGraphics_rulelabel(self):
'ITEMFONTFAMILY': self.fontFamily,
'RULELABEL': 'FALSE'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_false", 250, QSize(15, 15))

Expand All @@ -269,7 +268,7 @@ def test_wms_getLegendGraphics_rulelabel(self):
'LAYERTITLE': 'FALSE',
'RULELABEL': 'TRUE'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_true", 250, QSize(15, 15))

Expand All @@ -289,7 +288,7 @@ def test_wms_getLegendGraphics_rulelabel(self):
'ITEMFONTFAMILY': self.fontFamily,
'LAYERTITLE': 'FALSE'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_notset", 250, QSize(15, 15))

Expand All @@ -304,7 +303,7 @@ def test_wms_getLegendGraphics_rulelabel(self):
'LAYERTITLE': 'FALSE',
'RULELABEL': 'AUTO'
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_auto", 250, QSize(15, 15))

Expand All @@ -321,7 +320,7 @@ def test_wms_getLegendGraphics_rule(self):
'HEIGHT': '20',
'RULE': 'rule0',
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rule0", 250, QSize(15, 15))

Expand All @@ -336,7 +335,7 @@ def test_wms_getLegendGraphics_rule(self):
'HEIGHT': '20',
'RULE': 'rule1',
}
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
r, h = self._result(self._execute_request(qs))
self._img_diff_error(r, h, "WMS_GetLegendGraphic_rule1", 250, QSize(15, 15))

Expand Down Expand Up @@ -631,8 +630,8 @@ def test_wms_GetLegendGraphic_EmptyLegend(self):
}.items())])

h, r = self._execute_request(qs)
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), f"Header: {h}\nResponse:\n{r}")
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), f"Header: {h}\nResponse:\n{r}")

def test_wms_GetLegendGraphic_wmsRootName(self):
"""Test an unreported issue when a wmsRootName short name is set in the service capabilities"""
Expand All @@ -653,8 +652,8 @@ def test_wms_GetLegendGraphic_wmsRootName(self):
}.items())])

h, r = self._execute_request(qs)
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), f"Header: {h}\nResponse:\n{r}")
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), f"Header: {h}\nResponse:\n{r}")

# Then test with the wmsRootName short name:
qs = "?" + "&".join(["%s=%s" % i for i in list({
Expand All @@ -672,8 +671,8 @@ def test_wms_GetLegendGraphic_wmsRootName(self):
}.items())])

h, r = self._execute_request(qs)
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), f"Header: {h}\nResponse:\n{r}")
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), f"Header: {h}\nResponse:\n{r}")

def test_wms_GetLegendGraphic_ScaleSymbol_Min(self):
# 1:500000000 min
Expand Down
6 changes: 3 additions & 3 deletions tests/src/python/test_selective_masking.py
View file
Expand Up @@ -145,7 +145,7 @@ def tearDownClass(cls):

if (os.environ.get('QGIS_CONTINUOUS_INTEGRATION_RUN', None) != "true" and
cls.report != REPORT_TITLE):
QDesktopServices.openUrl(QUrl("file:///{}".format(report_file_path)))
QDesktopServices.openUrl(QUrl(f"file:///{report_file_path}"))

def get_symbollayer(self, layer, ruleId, symbollayer_ids):
"""
Expand Down Expand Up @@ -202,7 +202,7 @@ def check_renderings(self, map_settings, control_name):
res = self.checker.compareImages(control_name + suffix)

if not res:
TestSelectiveMasking.report += "<h2>{}</h2>\n".format(control_name) + self.checker.report()
TestSelectiveMasking.report += f"<h2>{control_name}</h2>\n" + self.checker.report()

self.assertTrue(res)

Expand Down Expand Up @@ -260,7 +260,7 @@ def check_layout_export(self, control_name, expected_nb_raster, layers=None, dpi
res = self.checker.compareImages(control_name)

if not res:
TestSelectiveMasking.report += "<h2>{}</h2>\n".format(control_name) + self.checker.report()
TestSelectiveMasking.report += f"<h2>{control_name}</h2>\n" + self.checker.report()

self.assertTrue(res)

Expand Down
2 changes: 0 additions & 2 deletions tests/testdata/test_plugin_path/PluginPathTest/__init__.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
__init__.py
Expand Down
2 changes: 0 additions & 2 deletions tests/testdata/test_plugin_path/ProcessingPluginTest/__init__.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
__init__.py
Expand Down
2 changes: 0 additions & 2 deletions tests/testdata/test_plugin_path/ProcessingPluginTest2/__init__.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
__init__.py
Expand Down

0 comments on commit cf77ddb

Please sign in to comment.