Tests: migrated to the pytest.

1 files changed, 81 insertions, 111 deletions

diff --git a/test/test_php_targets.py b/test/test_php_targets.py
index 0657554a..2eadf071 100644
--- a/test/test_php_targets.py
+++ b/test/test_php_targets.py
@@ -1,128 +1,98 @@
 from unit.applications.lang.php import TestApplicationPHP
+from conftest import option
+
 
 class TestPHPTargets(TestApplicationPHP):
     prerequisites = {'modules': {'php': 'any'}}
 
     def test_php_application_targets(self):
-        self.assertIn(
-            'success',
-            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": {
+        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": {
+                    "targets": {
+                        "type": "php",
+                        "processes": {"spare": 0},
                         "targets": {
-                            "type": "php",
-                            "processes": {"spare": 0},
-                            "targets": {
-                                "1": {
-                                    "script": "1.php",
-                                    "root": self.current_dir + "/php/targets",
-                                },
-                                "2": {
-                                    "script": "2.php",
-                                    "root": self.current_dir
-                                    + "/php/targets/2",
-                                },
-                                "default": {
-                                    "index": "index.php",
-                                    "root": self.current_dir + "/php/targets",
-                                },
+                            "1": {
+                                "script": "1.php",
+                                "root": option.test_dir + "/php/targets",
                             },
-                        }
-                    },
-                }
-            ),
+                            "2": {
+                                "script": "2.php",
+                                "root": option.test_dir + "/php/targets/2",
+                            },
+                            "default": {
+                                "index": "index.php",
+                                "root": option.test_dir + "/php/targets",
+                            },
+                        },
+                    }
+                },
+            }
         )
 
-        self.assertEqual(self.get(url='/1')['body'], '1')
-        self.assertEqual(self.get(url='/2')['body'], '2')
-        self.assertEqual(self.get(url='/blah')['status'], 503)  # TODO 404
-        self.assertEqual(self.get(url='/')['body'], 'index')
+        assert self.get(url='/1')['body'] == '1'
+        assert self.get(url='/2')['body'] == '2'
+        assert self.get(url='/blah')['status'] == 503  # TODO 404
+        assert self.get(url='/')['body'] == 'index'
 
-        self.assertIn(
-            'success',
-            self.conf(
-                "\"1.php\"", 'applications/targets/targets/default/index'
-            ),
-            'change targets index',
-        )
-        self.assertEqual(self.get(url='/')['body'], '1')
+        assert 'success' in self.conf(
+            "\"1.php\"", 'applications/targets/targets/default/index'
+        ), 'change targets index'
+        assert self.get(url='/')['body'] == '1'
 
-        self.assertIn(
-            'success',
-            self.conf_delete('applications/targets/targets/default/index'),
-            'remove targets index',
-        )
-        self.assertEqual(self.get(url='/')['body'], 'index')
+        assert 'success' in self.conf_delete(
+            'applications/targets/targets/default/index'
+        ), 'remove targets index'
+        assert self.get(url='/')['body'] == 'index'
 
     def test_php_application_targets_error(self):
-        self.assertIn(
-            'success',
-            self.conf(
-                {
-                    "listeners": {
-                        "*:7080": {"pass": "applications/targets/default"}
-                    },
-                    "applications": {
+        assert 'success' in self.conf(
+            {
+                "listeners": {
+                    "*:7080": {"pass": "applications/targets/default"}
+                },
+                "applications": {
+                    "targets": {
+                        "type": "php",
+                        "processes": {"spare": 0},
                         "targets": {
-                            "type": "php",
-                            "processes": {"spare": 0},
-                            "targets": {
-                                "default": {
-                                    "index": "index.php",
-                                    "root": self.current_dir + "/php/targets",
-                                },
+                            "default": {
+                                "index": "index.php",
+                                "root": option.test_dir + "/php/targets",
                             },
-                        }
-                    },
-                }
-            ),
-            'initial configuration',
-        )
-        self.assertEqual(self.get()['status'], 200)
-
-        self.assertIn(
-            'error',
-            self.conf(
-                {"pass": "applications/targets/blah"}, 'listeners/*:7080'
-            ),
-            'invalid targets pass',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                '"' + self.current_dir + '/php/targets\"',
-                'applications/targets/root',
-            ),
-            'invalid root',
-        )
-        self.assertIn(
-            'error',
-            self.conf('"index.php"', 'applications/targets/index'),
-            'invalid index',
-        )
-        self.assertIn(
-            'error',
-            self.conf('"index.php"', 'applications/targets/script'),
-            'invalid script',
-        )
-        self.assertIn(
-            'error',
-            self.conf_delete('applications/targets/default/root'),
-            'root remove',
-        )
-
+                        },
+                    }
+                },
+            }
+        ), 'initial configuration'
+        assert self.get()['status'] == 200
 
-if __name__ == '__main__':
-    TestPHPTargets.main()
+        assert 'error' in self.conf(
+            {"pass": "applications/targets/blah"}, 'listeners/*:7080'
+        ), 'invalid targets pass'
+        assert 'error' in self.conf(
+            '"' + 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'