1 files changed, 58 insertions, 96 deletions
diff --git a/test/test_python_basic.py b/test/test_python_basic.py
index d6445ac2..0cc70e51 100644
--- a/test/test_python_basic.py
+++ b/test/test_python_basic.py
@@ -19,142 +19,104 @@ class TestPythonBasic(TestControl):
     }
 
     def test_python_get_empty(self):
-        self.assertEqual(self.conf_get(), {'listeners': {}, 'applications': {}})
-        self.assertEqual(self.conf_get('listeners'), {})
-        self.assertEqual(self.conf_get('applications'), {})
+        assert self.conf_get() == {'listeners': {}, 'applications': {}}
+        assert self.conf_get('listeners') == {}
+        assert self.conf_get('applications') == {}
 
     def test_python_get_applications(self):
         self.conf(self.conf_app, 'applications')
 
         conf = self.conf_get()
 
-        self.assertEqual(conf['listeners'], {}, 'listeners')
-        self.assertEqual(
-            conf['applications'],
-            {
-                "app": {
-                    "type": "python",
-                    "processes": {"spare": 0},
-                    "path": "/app",
-                    "module": "wsgi",
-                }
-            },
-            'applications',
-        )
-
-        self.assertEqual(
-            self.conf_get('applications'),
-            {
-                "app": {
-                    "type": "python",
-                    "processes": {"spare": 0},
-                    "path": "/app",
-                    "module": "wsgi",
-                }
-            },
-            'applications prefix',
-        )
-
-        self.assertEqual(
-            self.conf_get('applications/app'),
-            {
+        assert conf['listeners'] == {}, 'listeners'
+        assert conf['applications'] == {
+            "app": {
                 "type": "python",
                 "processes": {"spare": 0},
                 "path": "/app",
                 "module": "wsgi",
-            },
-            'applications prefix 2',
-        )
+            }
+        }, 'applications'
 
-        self.assertEqual(
-            self.conf_get('applications/app/type'), 'python', 'type'
-        )
-        self.assertEqual(
-            self.conf_get('applications/app/processes/spare'), 0, 'spare'
-        )
+        assert self.conf_get('applications') == {
+            "app": {
+                "type": "python",
+                "processes": {"spare": 0},
+                "path": "/app",
+                "module": "wsgi",
+            }
+        }, 'applications prefix'
+
+        assert self.conf_get('applications/app') == {
+            "type": "python",
+            "processes": {"spare": 0},
+            "path": "/app",
+            "module": "wsgi",
+        }, 'applications prefix 2'
+
+        assert self.conf_get('applications/app/type') == 'python', 'type'
+        assert self.conf_get('applications/app/processes/spare') == 0, 'spare'
 
     def test_python_get_listeners(self):
         self.conf(self.conf_basic)
 
-        self.assertEqual(
-            self.conf_get()['listeners'],
-            {"*:7080": {"pass": "applications/app"}},
-            'listeners',
-        )
+        assert self.conf_get()['listeners'] == {
+            "*:7080": {"pass": "applications/app"}
+        }, 'listeners'
 
-        self.assertEqual(
-            self.conf_get('listeners'),
-            {"*:7080": {"pass": "applications/app"}},
-            'listeners prefix',
-        )
+        assert self.conf_get('listeners') == {
+            "*:7080": {"pass": "applications/app"}
+        }, 'listeners prefix'
 
-        self.assertEqual(
-            self.conf_get('listeners/*:7080'),
-            {"pass": "applications/app"},
-            'listeners prefix 2',
-        )
+        assert self.conf_get('listeners/*:7080') == {
+            "pass": "applications/app"
+        }, 'listeners prefix 2'
 
     def test_python_change_listener(self):
         self.conf(self.conf_basic)
         self.conf({"*:7081": {"pass": "applications/app"}}, 'listeners')
 
-        self.assertEqual(
-            self.conf_get('listeners'),
-            {"*:7081": {"pass": "applications/app"}},
-            'change listener',
-        )
+        assert self.conf_get('listeners') == {
+            "*:7081": {"pass": "applications/app"}
+        }, 'change listener'
 
     def test_python_add_listener(self):
         self.conf(self.conf_basic)
         self.conf({"pass": "applications/app"}, 'listeners/*:7082')
 
-        self.assertEqual(
-            self.conf_get('listeners'),
-            {
-                "*:7080": {"pass": "applications/app"},
-                "*:7082": {"pass": "applications/app"},
-            },
-            'add listener',
-        )
+        assert self.conf_get('listeners') == {
+            "*:7080": {"pass": "applications/app"},
+            "*:7082": {"pass": "applications/app"},
+        }, 'add listener'
 
     def test_python_change_application(self):
         self.conf(self.conf_basic)
 
         self.conf('30', 'applications/app/processes/max')
-        self.assertEqual(
-            self.conf_get('applications/app/processes/max'),
-            30,
-            'change application max',
-        )
+        assert (
+            self.conf_get('applications/app/processes/max') == 30
+        ), 'change application max'
 
         self.conf('"/www"', 'applications/app/path')
-        self.assertEqual(
-            self.conf_get('applications/app/path'),
-            '/www',
-            'change application path',
-        )
+        assert (
+            self.conf_get('applications/app/path') == '/www'
+        ), 'change application path'
 
     def test_python_delete(self):
         self.conf(self.conf_basic)
 
-        self.assertIn('error', self.conf_delete('applications/app'))
-        self.assertIn('success', self.conf_delete('listeners/*:7080'))
-        self.assertIn('success', self.conf_delete('applications/app'))
-        self.assertIn('error', self.conf_delete('applications/app'))
+        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_python_delete_blocks(self):
         self.conf(self.conf_basic)
 
-        self.assertIn('success', self.conf_delete('listeners'))
-        self.assertIn('success', self.conf_delete('applications'))
-
-        self.assertIn('success', self.conf(self.conf_app, 'applications'))
-        self.assertIn(
-            'success',
-            self.conf({"*:7081": {"pass": "applications/app"}}, 'listeners'),
-            'applications restore',
-        )
-
+        assert 'success' in self.conf_delete('listeners')
+        assert 'success' in self.conf_delete('applications')
 
-if __name__ == '__main__':
-    TestPythonBasic.main()
+        assert 'success' in self.conf(self.conf_app, 'applications')
+        assert 'success' in self.conf(
+            {"*:7081": {"pass": "applications/app"}}, 'listeners'
+        ), 'applications restore'