From d5e915934066c77a59d211efafca10c117b73d05 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Wed, 16 Sep 2020 21:31:15 +0100
Subject: Tests: migrated to the pytest.

---
 test/test_ruby_isolation.py | 54 +++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

(limited to 'test/test_ruby_isolation.py')

diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index 9bac162e..be20300e 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,9 +1,10 @@
 import os
+import pytest
 import shutil
-import unittest
 
 from unit.applications.lang.ruby import TestApplicationRuby
 from unit.feature.isolation import TestFeatureIsolation
+from conftest import option
 
 
 class TestRubyIsolation(TestApplicationRuby):
@@ -12,60 +13,45 @@ 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()
+                pytest.skip('requires unprivileged userns or root')
 
-        os.mkdir(self.testdir + '/ruby')
+        os.mkdir(self.temp_dir + '/ruby')
 
         shutil.copytree(
-            self.current_dir + '/ruby/status_int',
-            self.testdir + '/ruby/status_int',
+            option.test_dir + '/ruby/status_int',
+            self.temp_dir + '/ruby/status_int',
         )
         isolation = {
-            'namespaces': {'credential': not self.is_su, 'mount': True},
-            'rootfs': self.testdir,
+            'namespaces': {'credential': not is_su, 'mount': True},
+            'rootfs': self.temp_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'
-- 
cgit 


From 37390d2a3be3646ad5a4c52d46ce93fc8f8a416b Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Tue, 6 Oct 2020 20:30:51 +0100
Subject: Tests: fixed tests to run as root.

---
 test/test_ruby_isolation.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'test/test_ruby_isolation.py')

diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index be20300e..e88c60b2 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -33,15 +33,9 @@ class TestRubyIsolation(TestApplicationRuby):
             if not 'unprivileged_userns_clone' in isolation_features:
                 pytest.skip('requires unprivileged userns or root')
 
-        os.mkdir(self.temp_dir + '/ruby')
-
-        shutil.copytree(
-            option.test_dir + '/ruby/status_int',
-            self.temp_dir + '/ruby/status_int',
-        )
         isolation = {
             'namespaces': {'credential': not is_su, 'mount': True},
-            'rootfs': self.temp_dir,
+            'rootfs': option.test_dir,
         }
 
         self.load('status_int', isolation=isolation)
-- 
cgit 


From 6ec0ff35964c7805712d978625949f72ff5a63bc Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Wed, 7 Oct 2020 23:18:43 +0100
Subject: Tests: minor fixes.

---
 test/test_ruby_isolation.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'test/test_ruby_isolation.py')

diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index e88c60b2..13ca0e16 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,10 +1,9 @@
-import os
+
 import pytest
-import shutil
 
+from conftest import option
 from unit.applications.lang.ruby import TestApplicationRuby
 from unit.feature.isolation import TestFeatureIsolation
-from conftest import option
 
 
 class TestRubyIsolation(TestApplicationRuby):
-- 
cgit