From c183bd8749a19477390f8cb77efe5f6d223f0905 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Wed, 14 Jun 2023 18:20:09 +0100
Subject: Tests: get rid of classes in test files.

Class usage came from the unittest framework and it was always redundant
after migration to the pytest.  This commit removes classes from files
containing tests to make them more readable and understandable.
---
 test/test_ruby_isolation.py | 65 +++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

(limited to 'test/test_ruby_isolation.py')

diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py
index 82a12dff..59c0e5f6 100644
--- a/test/test_ruby_isolation.py
+++ b/test/test_ruby_isolation.py
@@ -1,42 +1,43 @@
-from unit.applications.lang.ruby import TestApplicationRuby
+from unit.applications.lang.ruby import ApplicationRuby
 
 prerequisites = {'modules': {'ruby': 'any'}, 'features': {'isolation': True}}
 
+client = ApplicationRuby()
 
-class TestRubyIsolation(TestApplicationRuby):
-    def test_ruby_isolation_rootfs(self, is_su, require, temp_dir):
-        isolation = {'rootfs': temp_dir}
-
-        if not is_su:
-            require(
-                {
-                    'features': {
-                        'isolation': [
-                            'unprivileged_userns_clone',
-                            'user',
-                            'mnt',
-                            'pid',
-                        ]
-                    }
-                }
-            )
 
-            isolation['namespaces'] = {
-                'mount': True,
-                'credential': True,
-                'pid': True,
+def test_ruby_isolation_rootfs(is_su, require, temp_dir):
+    isolation = {'rootfs': temp_dir}
+
+    if not is_su:
+        require(
+            {
+                'features': {
+                    'isolation': [
+                        'unprivileged_userns_clone',
+                        'user',
+                        'mnt',
+                        'pid',
+                    ]
+                }
             }
+        )
 
-        self.load('status_int', isolation=isolation)
+        isolation['namespaces'] = {
+            'mount': True,
+            'credential': True,
+            'pid': True,
+        }
 
-        assert 'success' in self.conf(
-            '"/ruby/status_int/config.ru"',
-            'applications/status_int/script',
-        )
+    client.load('status_int', isolation=isolation)
 
-        assert 'success' in self.conf(
-            '"/ruby/status_int"',
-            'applications/status_int/working_directory',
-        )
+    assert 'success' in client.conf(
+        '"/ruby/status_int/config.ru"',
+        'applications/status_int/script',
+    )
+
+    assert 'success' in client.conf(
+        '"/ruby/status_int"',
+        'applications/status_int/working_directory',
+    )
 
-        assert self.get()['status'] == 200, 'status int'
+    assert client.get()['status'] == 200, 'status int'
-- 
cgit