summaryrefslogtreecommitdiffhomepage
path: root/test/test_java_isolation_rootfs.py
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2023-05-10 10:29:16 -0700
committerKonstantin Pavlov <thresh@nginx.com>2023-05-10 10:29:16 -0700
commit69235c513277c64b513447d9b92c3c03d616f577 (patch)
tree0780c92ba28d92b547c85ea0bee5e3040e14dee2 /test/test_java_isolation_rootfs.py
parentb9bc222021e77bbdfb12576b3e315b962cf6b399 (diff)
parentfaf97dc06058de1c929af33a68adb34d3932b374 (diff)
downloadunit-1.30.0-1.tar.gz
unit-1.30.0-1.tar.bz2
Merged with the default branch.1.30.0-1
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: