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:
@@ -6,6 +6,7 @@ class TestPHPTargets(TestApplicationPHP):
|
||||
prerequisites = {'modules': {'php': 'any'}}
|
||||
|
||||
def test_php_application_targets(self):
|
||||
targets_dir = f"{option.test_dir}/php/targets"
|
||||
assert 'success' in self.conf(
|
||||
{
|
||||
"listeners": {"*:7080": {"pass": "routes"}},
|
||||
@@ -27,15 +28,15 @@ class TestPHPTargets(TestApplicationPHP):
|
||||
"targets": {
|
||||
"1": {
|
||||
"script": "1.php",
|
||||
"root": option.test_dir + "/php/targets",
|
||||
"root": targets_dir,
|
||||
},
|
||||
"2": {
|
||||
"script": "2.php",
|
||||
"root": option.test_dir + "/php/targets/2",
|
||||
"root": f'{targets_dir}/2',
|
||||
},
|
||||
"default": {
|
||||
"index": "index.php",
|
||||
"root": option.test_dir + "/php/targets",
|
||||
"root": targets_dir,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -72,7 +73,7 @@ class TestPHPTargets(TestApplicationPHP):
|
||||
"targets": {
|
||||
"default": {
|
||||
"index": "index.php",
|
||||
"root": option.test_dir + "/php/targets",
|
||||
"root": f"{option.test_dir}/php/targets",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -85,7 +86,7 @@ class TestPHPTargets(TestApplicationPHP):
|
||||
{"pass": "applications/targets/blah"}, 'listeners/*:7080'
|
||||
), 'invalid targets pass'
|
||||
assert 'error' in self.conf(
|
||||
'"' + option.test_dir + '/php/targets\"',
|
||||
f'"{option.test_dir}/php/targets"',
|
||||
'applications/targets/root',
|
||||
), 'invalid root'
|
||||
assert 'error' in self.conf(
|
||||
|
||||
Reference in New Issue
Block a user