1 files changed, 49 insertions, 16 deletions
diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index 13ca0e16..69e25de9 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,7 +1,10 @@
+import shutil
 
 import pytest
 
 from conftest import option
+from conftest import unit_run
+from conftest import unit_stop
 from unit.applications.lang.ruby import TestApplicationRuby
 from unit.feature.isolation import TestFeatureIsolation
 
@@ -9,33 +12,63 @@ from unit.feature.isolation import TestFeatureIsolation
 class TestRubyIsolation(TestApplicationRuby):
     prerequisites = {'modules': {'ruby': '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)
 
-        TestFeatureIsolation().check(cls.available, unit.temp_dir)
+        unit = unit_run()
+        option.temp_dir = unit['temp_dir']
 
-        return unit if not complete_check else unit.complete()
+        TestFeatureIsolation().check(option.available, unit['temp_dir'])
 
-    def test_ruby_isolation_rootfs(self, is_su):
-        isolation_features = self.available['features']['isolation'].keys()
+        assert unit_stop() is None
+        shutil.rmtree(unit['temp_dir'])
 
-        if 'mnt' not in isolation_features:
-            pytest.skip('requires mnt ns')
+        return check if not complete_check else check()
 
-        if not is_su:
-            if 'user' not in isolation_features:
-                pytest.skip('requires unprivileged userns or root')
+    def test_ruby_isolation_rootfs_mount_namespace(self, is_su):
+        isolation_features = option.available['features']['isolation'].keys()
 
+        if not is_su:
             if not 'unprivileged_userns_clone' in isolation_features:
                 pytest.skip('requires unprivileged userns or root')
 
-        isolation = {
-            'namespaces': {'credential': not is_su, 'mount': True},
-            'rootfs': option.test_dir,
-        }
+            if 'user' not in isolation_features:
+                pytest.skip('user namespace is not supported')
+
+            if 'mnt' not in isolation_features:
+                pytest.skip('mnt namespace is not supported')
+
+            if 'pid' not in isolation_features:
+                pytest.skip('pid namespace is not supported')
+
+        isolation = {'rootfs': option.test_dir}
+
+        if not is_su:
+            isolation['namespaces'] = {
+                'mount': True,
+                'credential': True,
+                'pid': True
+            }
+
+        self.load('status_int', isolation=isolation)
+
+        assert 'success' in self.conf(
+            '"/ruby/status_int/config.ru"', 'applications/status_int/script',
+        )
+
+        assert 'success' in self.conf(
+            '"/ruby/status_int"', 'applications/status_int/working_directory',
+        )
+
+        assert self.get()['status'] == 200, 'status int'
+
+    def test_ruby_isolation_rootfs(self, is_su):
+        if not is_su:
+            pytest.skip('requires root')
+            return
+
+        isolation = {'rootfs': option.test_dir}
 
         self.load('status_int', isolation=isolation)