1 files changed, 9 insertions, 38 deletions
diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index 69e25de9..c49b6732 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,32 +1,15 @@
+import os
 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
+from unit.option import option
 
 
 class TestRubyIsolation(TestApplicationRuby):
     prerequisites = {'modules': {'ruby': 'any'}, 'features': ['isolation']}
 
-    @classmethod
-    def setup_class(cls, complete_check=True):
-        check = super().setup_class(complete_check=False)
-
-        unit = unit_run()
-        option.temp_dir = unit['temp_dir']
-
-        TestFeatureIsolation().check(option.available, unit['temp_dir'])
-
-        assert unit_stop() is None
-        shutil.rmtree(unit['temp_dir'])
-
-        return check if not complete_check else check()
-
-    def test_ruby_isolation_rootfs_mount_namespace(self, is_su):
+    def test_ruby_isolation_rootfs(self, is_su):
         isolation_features = option.available['features']['isolation'].keys()
 
         if not is_su:
@@ -42,34 +25,22 @@ class TestRubyIsolation(TestApplicationRuby):
             if 'pid' not in isolation_features:
                 pytest.skip('pid namespace is not supported')
 
-        isolation = {'rootfs': option.test_dir}
+        isolation = {'rootfs': option.temp_dir}
 
         if not is_su:
             isolation['namespaces'] = {
                 'mount': True,
                 'credential': True,
-                'pid': True
+                'pid': True,
             }
 
-        self.load('status_int', isolation=isolation)
-
-        assert 'success' in self.conf(
-            '"/ruby/status_int/config.ru"', 'applications/status_int/script',
-        )
+        os.mkdir(option.temp_dir + '/ruby')
 
-        assert 'success' in self.conf(
-            '"/ruby/status_int"', 'applications/status_int/working_directory',
+        shutil.copytree(
+            option.test_dir + '/ruby/status_int',
+            option.temp_dir + '/ruby/status_int',
         )
 
-        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)
 
         assert 'success' in self.conf(