summaryrefslogtreecommitdiffhomepage
path: root/test/test_php_isolation.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2020-10-19 22:25:29 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2020-10-19 22:25:29 +0100
commit54837759f36eddb80af22c8d73e103a948221dc7 (patch)
tree420c6ce21ad3868db4037d160406f7754bb392e5 /test/test_php_isolation.py
parentd8628a43d0705deeb3473faf0252288038defc2b (diff)
downloadunit-54837759f36eddb80af22c8d73e103a948221dc7.tar.gz
unit-54837759f36eddb80af22c8d73e103a948221dc7.tar.bz2
Tests: fixed unit.log print.
Diffstat (limited to 'test/test_php_isolation.py')
-rw-r--r--test/test_php_isolation.py22
1 files changed, 15 insertions, 7 deletions
diff --git a/test/test_php_isolation.py b/test/test_php_isolation.py
index 8ab3419a..ac6942c6 100644
--- a/test/test_php_isolation.py
+++ b/test/test_php_isolation.py
@@ -1,6 +1,10 @@
+import shutil
+
import pytest
from conftest import option
+from conftest import unit_run
+from conftest import unit_stop
from unit.applications.lang.php import TestApplicationPHP
from unit.feature.isolation import TestFeatureIsolation
@@ -8,18 +12,22 @@ from unit.feature.isolation import TestFeatureIsolation
class TestPHPIsolation(TestApplicationPHP):
prerequisites = {'modules': {'php': 'any'}, 'features': ['isolation']}
- isolation = TestFeatureIsolation()
-
@classmethod
def setup_class(cls, complete_check=True):
- unit = super().setup_class(complete_check=False)
+ check = super().setup_class(complete_check=False)
+
+ unit = unit_run()
+ option.temp_dir = unit['temp_dir']
+
+ TestFeatureIsolation().check(option.available, unit['temp_dir'])
- TestFeatureIsolation().check(cls.available, unit.temp_dir)
+ assert unit_stop() is None
+ shutil.rmtree(unit['temp_dir'])
- return unit if not complete_check else unit.complete()
+ return check if not complete_check else check()
def test_php_isolation_rootfs(self, is_su):
- isolation_features = self.available['features']['isolation'].keys()
+ isolation_features = option.available['features']['isolation'].keys()
if 'mnt' not in isolation_features:
pytest.skip('requires mnt ns')
@@ -48,7 +56,7 @@ class TestPHPIsolation(TestApplicationPHP):
assert self.get()['status'] == 200, 'empty rootfs'
def test_php_isolation_rootfs_extensions(self, is_su):
- isolation_features = self.available['features']['isolation'].keys()
+ isolation_features = option.available['features']['isolation'].keys()
if not is_su:
if 'user' not in isolation_features: