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.

1 files changed, 115 insertions, 108 deletions

diff --git a/test/test_php_basic.py b/test/test_php_basic.py
index 1a2a00e6..64754961 100644
--- a/test/test_php_basic.py
+++ b/test/test_php_basic.py
@@ -1,123 +1,130 @@
-from unit.control import TestControl
+from unit.control import Control
 
 prerequisites = {'modules': {'php': 'any'}}
 
+client = Control()
 
-class TestPHPBasic(TestControl):
-    conf_app = {
+conf_app = {
+    "app": {
+        "type": "php",
+        "processes": {"spare": 0},
+        "root": "/app",
+        "index": "index.php",
+    }
+}
+
+conf_basic = {
+    "listeners": {"*:7080": {"pass": "applications/app"}},
+    "applications": conf_app,
+}
+
+
+def test_php_get_applications():
+    assert 'success' in client.conf(conf_app, 'applications')
+
+    conf = client.conf_get()
+
+    assert conf['listeners'] == {}, 'listeners'
+    assert conf['applications'] == {
         "app": {
             "type": "php",
             "processes": {"spare": 0},
             "root": "/app",
             "index": "index.php",
         }
-    }
-
-    conf_basic = {
-        "listeners": {"*:7080": {"pass": "applications/app"}},
-        "applications": conf_app,
-    }
+    }, 'applications'
 
-    def test_php_get_applications(self):
-        assert 'success' in self.conf(self.conf_app, 'applications')
-
-        conf = self.conf_get()
-
-        assert conf['listeners'] == {}, 'listeners'
-        assert conf['applications'] == {
-            "app": {
-                "type": "php",
-                "processes": {"spare": 0},
-                "root": "/app",
-                "index": "index.php",
-            }
-        }, 'applications'
-
-        assert self.conf_get('applications') == {
-            "app": {
-                "type": "php",
-                "processes": {"spare": 0},
-                "root": "/app",
-                "index": "index.php",
-            }
-        }, 'applications prefix'
-
-        assert self.conf_get('applications/app') == {
+    assert client.conf_get('applications') == {
+        "app": {
             "type": "php",
             "processes": {"spare": 0},
             "root": "/app",
             "index": "index.php",
-        }, 'applications prefix 2'
-
-        assert self.conf_get('applications/app/type') == 'php', 'type'
-        assert (
-            self.conf_get('applications/app/processes/spare') == 0
-        ), 'spare processes'
-
-    def test_php_get_listeners(self):
-        assert 'success' in self.conf(self.conf_basic)
-
-        assert self.conf_get()['listeners'] == {
-            "*:7080": {"pass": "applications/app"}
-        }, 'listeners'
-
-        assert self.conf_get('listeners') == {
-            "*:7080": {"pass": "applications/app"}
-        }, 'listeners prefix'
-
-        assert self.conf_get('listeners/*:7080') == {
-            "pass": "applications/app"
-        }, 'listeners prefix 2'
-
-    def test_php_change_listener(self):
-        assert 'success' in self.conf(self.conf_basic)
-        assert 'success' in self.conf(
-            {"*:7081": {"pass": "applications/app"}}, 'listeners'
-        )
-
-        assert self.conf_get('listeners') == {
-            "*:7081": {"pass": "applications/app"}
-        }, 'change listener'
-
-    def test_php_add_listener(self):
-        assert 'success' in self.conf(self.conf_basic)
-        assert 'success' in self.conf(
-            {"pass": "applications/app"}, 'listeners/*:7082'
-        )
-
-        assert self.conf_get('listeners') == {
-            "*:7080": {"pass": "applications/app"},
-            "*:7082": {"pass": "applications/app"},
-        }, 'add listener'
-
-    def test_php_change_application(self):
-        assert 'success' in self.conf(self.conf_basic)
-
-        assert 'success' in self.conf('30', 'applications/app/processes/max')
-        assert (
-            self.conf_get('applications/app/processes/max') == 30
-        ), 'change application max'
-
-        assert 'success' in self.conf('"/www"', 'applications/app/root')
-        assert (
-            self.conf_get('applications/app/root') == '/www'
-        ), 'change application root'
-
-    def test_php_delete(self):
-        assert 'success' in self.conf(self.conf_basic)
-
-        assert 'error' in self.conf_delete('applications/app')
-        assert 'success' in self.conf_delete('listeners/*:7080')
-        assert 'success' in self.conf_delete('applications/app')
-        assert 'error' in self.conf_delete('applications/app')
-
-    def test_php_delete_blocks(self):
-        assert 'success' in self.conf(self.conf_basic)
-
-        assert 'success' in self.conf_delete('listeners')
-        assert 'success' in self.conf_delete('applications')
-
-        assert 'success' in self.conf(self.conf_app, 'applications')
-        assert 'success' in self.conf(
-            {"*:7081": {"pass": "applications/app"}}, 'listeners'
-        ), 'applications restore'
+        }
+    }, 'applications prefix'
+
+    assert client.conf_get('applications/app') == {
+        "type": "php",
+        "processes": {"spare": 0},
+        "root": "/app",
+        "index": "index.php",
+    }, 'applications prefix 2'
+
+    assert client.conf_get('applications/app/type') == 'php', 'type'
+    assert (
+        client.conf_get('applications/app/processes/spare') == 0
+    ), 'spare processes'
+
+
+def test_php_get_listeners():
+    assert 'success' in client.conf(conf_basic)
+
+    assert client.conf_get()['listeners'] == {
+        "*:7080": {"pass": "applications/app"}
+    }, 'listeners'
+
+    assert client.conf_get('listeners') == {
+        "*:7080": {"pass": "applications/app"}
+    }, 'listeners prefix'
+
+    assert client.conf_get('listeners/*:7080') == {
+        "pass": "applications/app"
+    }, 'listeners prefix 2'
+
+
+def test_php_change_listener():
+    assert 'success' in client.conf(conf_basic)
+    assert 'success' in client.conf(
+        {"*:7081": {"pass": "applications/app"}}, 'listeners'
+    )
+
+    assert client.conf_get('listeners') == {
+        "*:7081": {"pass": "applications/app"}
+    }, 'change listener'
+
+
+def test_php_add_listener():
+    assert 'success' in client.conf(conf_basic)
+    assert 'success' in client.conf(
+        {"pass": "applications/app"}, 'listeners/*:7082'
+    )
+
+    assert client.conf_get('listeners') == {
+        "*:7080": {"pass": "applications/app"},
+        "*:7082": {"pass": "applications/app"},
+    }, 'add listener'
+
+
+def test_php_change_application():
+    assert 'success' in client.conf(conf_basic)
+
+    assert 'success' in client.conf('30', 'applications/app/processes/max')
+    assert (
+        client.conf_get('applications/app/processes/max') == 30
+    ), 'change application max'
+
+    assert 'success' in client.conf('"/www"', 'applications/app/root')
+    assert (
+        client.conf_get('applications/app/root') == '/www'
+    ), 'change application root'
+
+
+def test_php_delete():
+    assert 'success' in client.conf(conf_basic)
+
+    assert 'error' in client.conf_delete('applications/app')
+    assert 'success' in client.conf_delete('listeners/*:7080')
+    assert 'success' in client.conf_delete('applications/app')
+    assert 'error' in client.conf_delete('applications/app')
+
+
+def test_php_delete_blocks():
+    assert 'success' in client.conf(conf_basic)
+
+    assert 'success' in client.conf_delete('listeners')
+    assert 'success' in client.conf_delete('applications')
+
+    assert 'success' in client.conf(conf_app, 'applications')
+    assert 'success' in client.conf(
+        {"*:7081": {"pass": "applications/app"}}, 'listeners'
+    ), 'applications restore'