summaryrefslogtreecommitdiffhomepage
path: root/test/test_java_isolation_rootfs.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2023-02-21 17:21:29 +0000
committerAndrei Zeliankou <zelenkov@nginx.com>2023-02-21 17:21:29 +0000
commit7934dcabbc3c2b585e8d3f8fcee7020ba26f1687 (patch)
treebd0861e7832c14d92dd0ed9753932e58a2daf818 /test/test_java_isolation_rootfs.py
parentfcabbf09d85397e244f6486d6eca25e2366b61cd (diff)
downloadunit-7934dcabbc3c2b585e8d3f8fcee7020ba26f1687.tar.gz
unit-7934dcabbc3c2b585e8d3f8fcee7020ba26f1687.tar.bz2
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.
Diffstat (limited to 'test/test_java_isolation_rootfs.py')
-rw-r--r--test/test_java_isolation_rootfs.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py
index 3c6a45a3..28668997 100644
--- a/test/test_java_isolation_rootfs.py
+++ b/test/test_java_isolation_rootfs.py
@@ -13,17 +13,17 @@ class TestJavaIsolationRootfs(TestApplicationJava):
if not is_su:
pytest.skip('require root')
- os.makedirs(option.temp_dir + '/jars')
- os.makedirs(option.temp_dir + '/tmp')
- os.chmod(option.temp_dir + '/tmp', 0o777)
+ os.makedirs(f'{option.temp_dir}/jars')
+ os.makedirs(f'{option.temp_dir}/tmp')
+ os.chmod(f'{option.temp_dir}/tmp', 0o777)
try:
subprocess.run(
[
"mount",
"--bind",
- option.current_dir + "/build",
- option.temp_dir + "/jars",
+ f'{option.current_dir}/build',
+ f'{option.temp_dir}/jars',
],
stderr=subprocess.STDOUT,
)
@@ -32,7 +32,7 @@ class TestJavaIsolationRootfs(TestApplicationJava):
raise
except subprocess.CalledProcessError:
- pytest.fail('Can\'t run mount process.')
+ pytest.fail("Can't run mount process.")
def teardown_method(self, is_su):
if not is_su:
@@ -40,7 +40,7 @@ class TestJavaIsolationRootfs(TestApplicationJava):
try:
subprocess.run(
- ["umount", "--lazy", option.temp_dir + "/jars"],
+ ["umount", "--lazy", f"{option.temp_dir}/jars"],
stderr=subprocess.STDOUT,
)
@@ -48,7 +48,7 @@ class TestJavaIsolationRootfs(TestApplicationJava):
raise
except subprocess.CalledProcessError:
- pytest.fail('Can\'t run umount process.')
+ pytest.fail("Can't run umount process.")
def test_java_isolation_rootfs_chroot_war(self, is_su, temp_dir):
if not is_su: