Skip to content

Commit cf77ddb

Browse files
Gustrynyalldawson
Gustry
authored and
nyalldawson
committedApr 18, 2023
Python - Upgrade test folder to Python 3.7 minimum
·
ltr-3_40final-3_32_0
1 parent 121f46a commit cf77ddb

File tree

6 files changed

+22
-29
lines changed

6 files changed

+22
-29
lines changed
 

‎tests/src/python/test_provider_gdal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def testInt8(self):
312312
def testGdbMetadata(self):
313313
"""Test reading GDB layer metadata"""
314314
path = os.path.join(unitTestDataPath(), 'raster_metadata.gdb')
315-
rl = QgsRasterLayer('OpenFileGDB:{}:int'.format(path), 'gdb', 'gdal')
315+
rl = QgsRasterLayer(f'OpenFileGDB:{path}:int', 'gdb', 'gdal')
316316
self.assertTrue(rl.isValid())
317317

318318
self.assertEqual(rl.metadata().identifier(), 'int')

‎tests/src/python/test_qgsserver_wms_getlegendgraphic.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""QGIS Unit tests for QgsServer WMS GetLegendGraphic.
32
43
From build dir, run: ctest -R PyQgsServerWMSGetLegendGraphic -V
@@ -68,10 +67,10 @@ def test_getLegendGraphics(self):
6867
# 'HEIGHT': '20', # optional
6968
'LAYER': 'testlayer%20èé',
7069
}
71-
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
70+
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
7271
h, r = self._execute_request(qs)
73-
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
74-
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
72+
self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), f"Header: {h}\nResponse:\n{r}")
73+
self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), f"Header: {h}\nResponse:\n{r}")
7574

7675
def test_wms_GetLegendGraphic_LayerSpace(self):
7776
qs = "?" + "&".join(["%s=%s" % i for i in list({
@@ -190,7 +189,7 @@ def test_wms_getLegendGraphics_layertitle(self):
190189
'LAYERTITLE': 'TRUE',
191190
'RULELABEL': 'TRUE'
192191
}
193-
qs = '?' + '&'.join(["%s=%s" % (k, v) for k, v in parms.items()])
192+
qs = '?' + '&'.join([f"{k}={v}" for k, v in parms.items()])
194193
r, h = self._result(self._execute_request(qs))
195194
self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15))
196195

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

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

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

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

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

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

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

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

@@ -631,8 +630,8 @@ def test_wms_GetLegendGraphic_EmptyLegend(self):
631630
}.items())])
632631

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

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

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

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

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

678677
def test_wms_GetLegendGraphic_ScaleSymbol_Min(self):
679678
# 1:500000000 min

‎tests/src/python/test_selective_masking.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def tearDownClass(cls):
145145

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

150150
def get_symbollayer(self, layer, ruleId, symbollayer_ids):
151151
"""
@@ -202,7 +202,7 @@ def check_renderings(self, map_settings, control_name):
202202
res = self.checker.compareImages(control_name + suffix)
203203

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

207207
self.assertTrue(res)
208208

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

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

265265
self.assertTrue(res)
266266

‎tests/testdata/test_plugin_path/PluginPathTest/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
31
"""
42
***************************************************************************
53
__init__.py

‎tests/testdata/test_plugin_path/ProcessingPluginTest/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
31
"""
42
***************************************************************************
53
__init__.py

‎tests/testdata/test_plugin_path/ProcessingPluginTest2/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
31
"""
42
***************************************************************************
53
__init__.py

0 commit comments

Comments
 (0)
Please sign in to comment.