summaryrefslogtreecommitdiffhomepage
path: root/test/test_java_isolation_rootfs.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2023-05-25 16:56:14 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2023-05-25 16:56:14 +0100
commit18fcc07c7796889fe1cc4bc86564459ccd387ae7 (patch)
treeb38ea8171bb88ccdee8317747389789944198fc4 /test/test_java_isolation_rootfs.py
parent3e4fa1e2022970dee003bea0932ea0c10f8744ba (diff)
downloadunit-18fcc07c7796889fe1cc4bc86564459ccd387ae7.tar.gz
unit-18fcc07c7796889fe1cc4bc86564459ccd387ae7.tar.bz2
Tests: unified setup method usage.
To make fixtures accessible inside of setup methods in tests all these methods are renamed to the "setup_method_fixture" and decorated by autouse flag. Also all setup methods moved to the top of the files.
Diffstat (limited to 'test/test_java_isolation_rootfs.py')
-rw-r--r--test/test_java_isolation_rootfs.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py
index 28668997..28bc4a0d 100644
--- a/test/test_java_isolation_rootfs.py
+++ b/test/test_java_isolation_rootfs.py
@@ -9,13 +9,14 @@ from unit.option import option
class TestJavaIsolationRootfs(TestApplicationJava):
prerequisites = {'modules': {'java': 'all'}}
- def setup_method(self, is_su):
+ @pytest.fixture(autouse=True)
+ def setup_method_fixture(self, is_su, temp_dir):
if not is_su:
pytest.skip('require root')
- os.makedirs(f'{option.temp_dir}/jars')
- os.makedirs(f'{option.temp_dir}/tmp')
- os.chmod(f'{option.temp_dir}/tmp', 0o777)
+ os.makedirs(f'{temp_dir}/jars')
+ os.makedirs(f'{temp_dir}/tmp')
+ os.chmod(f'{temp_dir}/tmp', 0o777)
try:
subprocess.run(
@@ -23,7 +24,7 @@ class TestJavaIsolationRootfs(TestApplicationJava):
"mount",
"--bind",
f'{option.current_dir}/build',
- f'{option.temp_dir}/jars',
+ f'{temp_dir}/jars',
],
stderr=subprocess.STDOUT,
)