From 281899fcef10eaf815d90958d49243c5060ffac0 Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Tue, 26 Mar 2019 23:38:30 +0300 Subject: Tests: style. --- test/test_python_basic.py | 148 ++++++++++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 58 deletions(-) (limited to 'test/test_python_basic.py') diff --git a/test/test_python_basic.py b/test/test_python_basic.py index b5179dea..f2a5b9f6 100644 --- a/test/test_python_basic.py +++ b/test/test_python_basic.py @@ -1,38 +1,37 @@ import unittest import unit -class TestUnitPythonBasic(unit.TestUnitControl): +class TestUnitPythonBasic(unit.TestUnitControl): def setUpClass(): unit.TestUnit().check_modules('python') conf_app = { "app": { "type": "python", - "processes": { "spare": 0 }, + "processes": {"spare": 0}, "path": "/app", - "module": "wsgi" + "module": "wsgi", } } conf_basic = { - "listeners": { - "*:7080": { - "application": "app" - } - }, - "applications": conf_app + "listeners": {"*:7080": {"application": "app"}}, + "applications": conf_app, } def test_python_get_empty(self): - self.assertEqual(self.conf_get(), - {'listeners': {}, 'applications': {}}, 'empty') + self.assertEqual( + self.conf_get(), {'listeners': {}, 'applications': {}}, 'empty' + ) def test_python_get_prefix_listeners(self): self.assertEqual(self.conf_get('listeners'), {}, 'listeners prefix') def test_python_get_prefix_applications(self): - self.assertEqual(self.conf_get('applications'), {}, 'applications prefix') + self.assertEqual( + self.conf_get('applications'), {}, 'applications prefix' + ) def test_python_get_applications(self): self.conf(self.conf_app, 'applications') @@ -40,113 +39,146 @@ class TestUnitPythonBasic(unit.TestUnitControl): conf = self.conf_get() self.assertEqual(conf['listeners'], {}, 'listeners') - self.assertEqual(conf['applications'], + self.assertEqual( + conf['applications'], { "app": { "type": "python", - "processes": { "spare": 0 }, + "processes": {"spare": 0}, "path": "/app", - "module": "wsgi" + "module": "wsgi", } }, - 'applications') + 'applications', + ) def test_python_get_applications_prefix(self): self.conf(self.conf_app, 'applications') - self.assertEqual(self.conf_get('applications'), + self.assertEqual( + self.conf_get('applications'), { "app": { "type": "python", - "processes": { "spare": 0 }, + "processes": {"spare": 0}, "path": "/app", - "module":"wsgi" + "module": "wsgi", } }, - 'applications prefix') + 'applications prefix', + ) def test_python_get_applications_prefix_2(self): self.conf(self.conf_app, 'applications') - self.assertEqual(self.conf_get('applications/app'), + self.assertEqual( + self.conf_get('applications/app'), { "type": "python", - "processes": { "spare": 0 }, + "processes": {"spare": 0}, "path": "/app", - "module": "wsgi" + "module": "wsgi", }, - 'applications prefix 2') + 'applications prefix 2', + ) def test_python_get_applications_prefix_3(self): self.conf(self.conf_app, 'applications') - self.assertEqual(self.conf_get('applications/app/type'), 'python', - 'type') - self.assertEqual(self.conf_get('applications/app/processes/spare'), 0, - 'spare') + self.assertEqual( + self.conf_get('applications/app/type'), 'python', 'type' + ) + self.assertEqual( + 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":{"application":"app"}}, 'listeners') + self.assertEqual( + self.conf_get()['listeners'], + {"*:7080": {"application": "app"}}, + 'listeners', + ) def test_python_get_listeners_prefix(self): self.conf(self.conf_basic) - self.assertEqual(self.conf_get('listeners'), - {"*:7080":{"application":"app"}}, 'listeners prefix') + self.assertEqual( + self.conf_get('listeners'), + {"*:7080": {"application": "app"}}, + 'listeners prefix', + ) def test_python_get_listeners_prefix_2(self): self.conf(self.conf_basic) - self.assertEqual(self.conf_get('listeners/*:7080'), - {"application":"app"}, 'listeners prefix 2') + self.assertEqual( + self.conf_get('listeners/*:7080'), + {"application": "app"}, + 'listeners prefix 2', + ) def test_python_change_listener(self): self.conf(self.conf_basic) - self.conf({"*:7081":{"application":"app"}}, 'listeners') + self.conf({"*:7081": {"application": "app"}}, 'listeners') - self.assertEqual(self.conf_get('listeners'), - {"*:7081": {"application":"app"}}, 'change listener') + self.assertEqual( + self.conf_get('listeners'), + {"*:7081": {"application": "app"}}, + 'change listener', + ) def test_python_add_listener(self): self.conf(self.conf_basic) - self.conf({"application":"app"}, 'listeners/*:7082') + self.conf({"application": "app"}, 'listeners/*:7082') - self.assertEqual(self.conf_get('listeners'), + self.assertEqual( + self.conf_get('listeners'), { - "*:7080": { - "application": "app" - }, - "*:7082": { - "application": "app" - } + "*:7080": {"application": "app"}, + "*:7082": {"application": "app"}, }, - 'add listener') + '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') + self.assertEqual( + 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') + self.assertEqual( + 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'), - 'delete app before listener') - self.assertIn('success', self.conf_delete('listeners/*:7080'), - 'delete listener') - self.assertIn('success', self.conf_delete('applications/app'), - 'delete app after listener') - self.assertIn('error', self.conf_delete('applications/app'), - 'delete app again') + self.assertIn( + 'error', + self.conf_delete('applications/app'), + 'delete app before listener', + ) + self.assertIn( + 'success', self.conf_delete('listeners/*:7080'), 'delete listener' + ) + self.assertIn( + 'success', + self.conf_delete('applications/app'), + 'delete app after listener', + ) + self.assertIn( + 'error', self.conf_delete('applications/app'), 'delete app again' + ) + if __name__ == '__main__': TestUnitPythonBasic.main() -- cgit From 19eba1730a1ca839ed62a37f34c204f580d1b653 Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Thu, 28 Mar 2019 18:43:13 +0300 Subject: Tests: unit module refactoring. --- test/test_python_basic.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/test_python_basic.py') diff --git a/test/test_python_basic.py b/test/test_python_basic.py index f2a5b9f6..1869103f 100644 --- a/test/test_python_basic.py +++ b/test/test_python_basic.py @@ -1,10 +1,9 @@ -import unittest -import unit +from unit.control import TestControl -class TestUnitPythonBasic(unit.TestUnitControl): +class TestPythonBasic(TestControl): def setUpClass(): - unit.TestUnit().check_modules('python') + TestControl().check_modules('python') conf_app = { "app": { @@ -181,4 +180,4 @@ class TestUnitPythonBasic(unit.TestUnitControl): if __name__ == '__main__': - TestUnitPythonBasic.main() + TestPythonBasic.main() -- cgit From af24e4dec453af7e3dcb45347cb59bfcbc037843 Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Tue, 9 Apr 2019 16:14:42 +0300 Subject: Tests: simplified module checking. --- test/test_python_basic.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/test_python_basic.py') diff --git a/test/test_python_basic.py b/test/test_python_basic.py index 1869103f..c425718d 100644 --- a/test/test_python_basic.py +++ b/test/test_python_basic.py @@ -2,8 +2,7 @@ from unit.control import TestControl class TestPythonBasic(TestControl): - def setUpClass(): - TestControl().check_modules('python') + prerequisites = ['python'] conf_app = { "app": { -- cgit From c1a3b06d03c01e4ed40018944b90e6347ebf77d7 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Mon, 22 Apr 2019 18:20:53 +0300 Subject: Tests: using "pass" option instead of deprecated "application". --- test/test_python_basic.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/test_python_basic.py') diff --git a/test/test_python_basic.py b/test/test_python_basic.py index c425718d..9987e886 100644 --- a/test/test_python_basic.py +++ b/test/test_python_basic.py @@ -14,7 +14,7 @@ class TestPythonBasic(TestControl): } conf_basic = { - "listeners": {"*:7080": {"application": "app"}}, + "listeners": {"*:7080": {"pass": "applications/app"}}, "applications": conf_app, } @@ -95,7 +95,7 @@ class TestPythonBasic(TestControl): self.assertEqual( self.conf_get()['listeners'], - {"*:7080": {"application": "app"}}, + {"*:7080": {"pass": "applications/app"}}, 'listeners', ) @@ -104,7 +104,7 @@ class TestPythonBasic(TestControl): self.assertEqual( self.conf_get('listeners'), - {"*:7080": {"application": "app"}}, + {"*:7080": {"pass": "applications/app"}}, 'listeners prefix', ) @@ -113,29 +113,29 @@ class TestPythonBasic(TestControl): self.assertEqual( self.conf_get('listeners/*:7080'), - {"application": "app"}, + {"pass": "applications/app"}, 'listeners prefix 2', ) def test_python_change_listener(self): self.conf(self.conf_basic) - self.conf({"*:7081": {"application": "app"}}, 'listeners') + self.conf({"*:7081": {"pass": "applications/app"}}, 'listeners') self.assertEqual( self.conf_get('listeners'), - {"*:7081": {"application": "app"}}, + {"*:7081": {"pass": "applications/app"}}, 'change listener', ) def test_python_add_listener(self): self.conf(self.conf_basic) - self.conf({"application": "app"}, 'listeners/*:7082') + self.conf({"pass": "applications/app"}, 'listeners/*:7082') self.assertEqual( self.conf_get('listeners'), { - "*:7080": {"application": "app"}, - "*:7082": {"application": "app"}, + "*:7080": {"pass": "applications/app"}, + "*:7082": {"pass": "applications/app"}, }, 'add listener', ) -- cgit