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, 86 insertions, 86 deletions

diff --git a/test/test_php_targets.py b/test/test_php_targets.py
index db9b56ce..857a2dc8 100644
--- a/test/test_php_targets.py
+++ b/test/test_php_targets.py
@@ -1,100 +1,100 @@
-from unit.applications.lang.php import TestApplicationPHP
+from unit.applications.lang.php import ApplicationPHP
 from unit.option import option
 
 prerequisites = {'modules': {'php': 'any'}}
 
+client = ApplicationPHP()
 
-class TestPHPTargets(TestApplicationPHP):
-    def test_php_application_targets(self):
-        targets_dir = f"{option.test_dir}/php/targets"
-        assert 'success' in self.conf(
-            {
-                "listeners": {"*:7080": {"pass": "routes"}},
-                "routes": [
-                    {
-                        "match": {"uri": "/1"},
-                        "action": {"pass": "applications/targets/1"},
-                    },
-                    {
-                        "match": {"uri": "/2"},
-                        "action": {"pass": "applications/targets/2"},
-                    },
-                    {"action": {"pass": "applications/targets/default"}},
-                ],
-                "applications": {
+
+def test_php_application_targets():
+    targets_dir = f"{option.test_dir}/php/targets"
+    assert 'success' in client.conf(
+        {
+            "listeners": {"*:7080": {"pass": "routes"}},
+            "routes": [
+                {
+                    "match": {"uri": "/1"},
+                    "action": {"pass": "applications/targets/1"},
+                },
+                {
+                    "match": {"uri": "/2"},
+                    "action": {"pass": "applications/targets/2"},
+                },
+                {"action": {"pass": "applications/targets/default"}},
+            ],
+            "applications": {
+                "targets": {
+                    "type": client.get_application_type(),
+                    "processes": {"spare": 0},
                     "targets": {
-                        "type": self.get_application_type(),
-                        "processes": {"spare": 0},
-                        "targets": {
-                            "1": {
-                                "script": "1.php",
-                                "root": targets_dir,
-                            },
-                            "2": {
-                                "script": "2.php",
-                                "root": f'{targets_dir}/2',
-                            },
-                            "default": {
-                                "index": "index.php",
-                                "root": targets_dir,
-                            },
+                        "1": {
+                            "script": "1.php",
+                            "root": targets_dir,
                         },
-                    }
-                },
-            }
-        )
+                        "2": {
+                            "script": "2.php",
+                            "root": f'{targets_dir}/2',
+                        },
+                        "default": {
+                            "index": "index.php",
+                            "root": targets_dir,
+                        },
+                    },
+                }
+            },
+        }
+    )
 
-        assert self.get(url='/1')['body'] == '1'
-        assert self.get(url='/2')['body'] == '2'
-        assert self.get(url='/blah')['status'] == 404
-        assert self.get(url='/')['body'] == 'index'
-        assert self.get(url='/1.php?test=test.php/')['body'] == '1'
+    assert client.get(url='/1')['body'] == '1'
+    assert client.get(url='/2')['body'] == '2'
+    assert client.get(url='/blah')['status'] == 404
+    assert client.get(url='/')['body'] == 'index'
+    assert client.get(url='/1.php?test=test.php/')['body'] == '1'
 
-        assert 'success' in self.conf(
-            "\"1.php\"", 'applications/targets/targets/default/index'
-        ), 'change targets index'
-        assert self.get(url='/')['body'] == '1'
+    assert 'success' in client.conf(
+        "\"1.php\"", 'applications/targets/targets/default/index'
+    ), 'change targets index'
+    assert client.get(url='/')['body'] == '1'
 
-        assert 'success' in self.conf_delete(
-            'applications/targets/targets/default/index'
-        ), 'remove targets index'
-        assert self.get(url='/')['body'] == 'index'
+    assert 'success' in client.conf_delete(
+        'applications/targets/targets/default/index'
+    ), 'remove targets index'
+    assert client.get(url='/')['body'] == 'index'
 
-    def test_php_application_targets_error(self):
-        assert 'success' in self.conf(
-            {
-                "listeners": {
-                    "*:7080": {"pass": "applications/targets/default"}
-                },
-                "applications": {
+
+def test_php_application_targets_error():
+    assert 'success' in client.conf(
+        {
+            "listeners": {"*:7080": {"pass": "applications/targets/default"}},
+            "applications": {
+                "targets": {
+                    "type": client.get_application_type(),
+                    "processes": {"spare": 0},
                     "targets": {
-                        "type": self.get_application_type(),
-                        "processes": {"spare": 0},
-                        "targets": {
-                            "default": {
-                                "index": "index.php",
-                                "root": f"{option.test_dir}/php/targets",
-                            },
+                        "default": {
+                            "index": "index.php",
+                            "root": f"{option.test_dir}/php/targets",
                         },
-                    }
-                },
-            }
-        ), 'initial configuration'
-        assert self.get()['status'] == 200
+                    },
+                }
+            },
+        }
+    ), 'initial configuration'
+    assert client.get()['status'] == 200
 
-        assert 'error' in self.conf(
-            {"pass": "applications/targets/blah"}, 'listeners/*:7080'
-        ), 'invalid targets pass'
-        assert 'error' in self.conf(
-            f'"{option.test_dir}/php/targets"',
-            'applications/targets/root',
-        ), 'invalid root'
-        assert 'error' in self.conf(
-            '"index.php"', 'applications/targets/index'
-        ), 'invalid index'
-        assert 'error' in self.conf(
-            '"index.php"', 'applications/targets/script'
-        ), 'invalid script'
-        assert 'error' in self.conf_delete(
-            'applications/targets/default/root'
-        ), 'root remove'
+    assert 'error' in client.conf(
+        {"pass": "applications/targets/blah"}, 'listeners/*:7080'
+    ), 'invalid targets pass'
+    assert 'error' in client.conf(
+        f'"{option.test_dir}/php/targets"',
+        'applications/targets/root',
+    ), 'invalid root'
+    assert 'error' in client.conf(
+        '"index.php"', 'applications/targets/index'
+    ), 'invalid index'
+    assert 'error' in client.conf(
+        '"index.php"', 'applications/targets/script'
+    ), 'invalid script'
+    assert 'error' in client.conf_delete(
+        'applications/targets/default/root'
+    ), 'root remove'