1 files changed, 18 insertions, 39 deletions
diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index 9bac162e..13ca0e16 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,7 +1,7 @@
-import os
-import shutil
-import unittest
 
+import pytest
+
+from conftest import option
 from unit.applications.lang.ruby import TestApplicationRuby
 from unit.feature.isolation import TestFeatureIsolation
 
@@ -12,60 +12,39 @@ class TestRubyIsolation(TestApplicationRuby):
     isolation = TestFeatureIsolation()
 
     @classmethod
-    def setUpClass(cls, complete_check=True):
-        unit = super().setUpClass(complete_check=False)
+    def setup_class(cls, complete_check=True):
+        unit = super().setup_class(complete_check=False)
 
-        TestFeatureIsolation().check(cls.available, unit.testdir)
+        TestFeatureIsolation().check(cls.available, unit.temp_dir)
 
         return unit if not complete_check else unit.complete()
 
-    def test_ruby_isolation_rootfs(self):
+    def test_ruby_isolation_rootfs(self, is_su):
         isolation_features = self.available['features']['isolation'].keys()
 
         if 'mnt' not in isolation_features:
-            print('requires mnt ns')
-            raise unittest.SkipTest()
+            pytest.skip('requires mnt ns')
 
-        if not self.is_su:
+        if not is_su:
             if 'user' not in isolation_features:
-                print('requires unprivileged userns or root')
-                raise unittest.SkipTest()
+                pytest.skip('requires unprivileged userns or root')
 
             if not 'unprivileged_userns_clone' in isolation_features:
-                print('requires unprivileged userns or root')
-                raise unittest.SkipTest()
-
-        os.mkdir(self.testdir + '/ruby')
+                pytest.skip('requires unprivileged userns or root')
 
-        shutil.copytree(
-            self.current_dir + '/ruby/status_int',
-            self.testdir + '/ruby/status_int',
-        )
         isolation = {
-            'namespaces': {'credential': not self.is_su, 'mount': True},
-            'rootfs': self.testdir,
+            'namespaces': {'credential': not is_su, 'mount': True},
+            'rootfs': option.test_dir,
         }
 
         self.load('status_int', isolation=isolation)
 
-        self.assertIn(
-            'success',
-            self.conf(
-                '"/ruby/status_int/config.ru"',
-                'applications/status_int/script',
-            ),
+        assert 'success' in self.conf(
+            '"/ruby/status_int/config.ru"', 'applications/status_int/script',
         )
 
-        self.assertIn(
-            'success',
-            self.conf(
-                '"/ruby/status_int"',
-                'applications/status_int/working_directory',
-            ),
+        assert 'success' in self.conf(
+            '"/ruby/status_int"', 'applications/status_int/working_directory',
         )
 
-        self.assertEqual(self.get()['status'], 200, 'status int')
-
-
-if __name__ == '__main__':
-    TestRubyIsolation.main()
+        assert self.get()['status'] == 200, 'status int'