Tests: switched to using f-strings.

Previously, it was necessary to support older versions of Python for
compatibility.  F-strings were released in Python 3.6.  Python 3.5 was
marked as unsupported by the end of 2020, so now it's possible to start
using f-strings safely for better readability and performance.
This commit is contained in:
Andrei Zeliankou
2023-02-21 17:21:29 +00:00
parent fcabbf09d8
commit 7934dcabbc
74 changed files with 695 additions and 778 deletions

View File

@@ -6,6 +6,8 @@ class TestPythonTargets(TestApplicationPython):
prerequisites = {'modules': {'python': 'all'}}
def test_python_targets(self):
python_dir = f'{option.test_dir}/python'
assert 'success' in self.conf(
{
"listeners": {"*:7080": {"pass": "routes"}},
@@ -22,9 +24,8 @@ class TestPythonTargets(TestApplicationPython):
"applications": {
"targets": {
"type": self.get_application_type(),
"working_directory": option.test_dir
+ "/python/targets/",
"path": option.test_dir + '/python/targets/',
"working_directory": f'{python_dir}/targets/',
"path": f'{python_dir}/targets/',
"targets": {
"1": {
"module": "wsgi",
@@ -49,6 +50,8 @@ class TestPythonTargets(TestApplicationPython):
assert resp['body'] == '2'
def test_python_targets_prefix(self):
python_dir = f'{option.test_dir}/python'
assert 'success' in self.conf(
{
"listeners": {"*:7080": {"pass": "routes"}},
@@ -65,9 +68,8 @@ class TestPythonTargets(TestApplicationPython):
"applications": {
"targets": {
"type": "python",
"working_directory": option.test_dir
+ "/python/targets/",
"path": option.test_dir + '/python/targets/',
"working_directory": f'{python_dir}/targets/',
"path": f'{python_dir}/targets/',
"protocol": "wsgi",
"targets": {
"app": {