diff options
| author | Andrey Zelenkov <zelenkov@nginx.com> | 2018-01-15 15:57:32 +0300 |
|---|---|---|
| committer | Andrey Zelenkov <zelenkov@nginx.com> | 2018-01-15 15:57:32 +0300 |
| commit | b12f1ea42df315defba4c04c6281c1479fe37765 (patch) | |
| tree | 7aad60f50f9c0212727cd4f705ee21f428e6b5b4 | |
| parent | 75af52fd65a7a55bf340727a3d47ae3b337c3b56 (diff) | |
| download | unit-b12f1ea42df315defba4c04c6281c1479fe37765.tar.gz unit-b12f1ea42df315defba4c04c6281c1479fe37765.tar.bz2 | |
Tests: assertTry() function introduced.
| -rw-r--r-- | test/test_configuration.py | 45 | ||||
| -rw-r--r-- | test/unit.py | 4 |
2 files changed, 30 insertions, 19 deletions
diff --git a/test/test_configuration.py b/test/test_configuration.py index b9aad8a4..8a3612a8 100644 --- a/test/test_configuration.py +++ b/test/test_configuration.py @@ -6,12 +6,36 @@ class TestUnitConfiguration(unit.TestUnitControl): def setUpClass():
unit.TestUnit().check_modules('python')
+ def test_json(self):
+ self.assertIn('error', self.put('/', '00'), 'leading zero')
+
def test_json_applications(self):
self.assertIn('error', self.put('/applications', '"{}"'),
'applications string')
self.assertIn('error', self.put('/applications', '{'),
'applications miss brace')
+ self.assertTry('assertIn', 'negative workers', 'error',
+ self.put('/applications', """
+ {
+ "app": {
+ "type": "python",
+ "workers": -1,
+ "path": "/app",
+ "module": "wsgi"
+ }
+ }
+ """))
+
+ self.assertTry('assertIn', 'application type only', 'error',
+ self.put('/applications', """
+ {
+ "app": {
+ "type": "python"
+ }
+ }
+ """))
+
self.assertIn('error', self.put('/applications', """
{
app": {
@@ -93,6 +117,8 @@ class TestUnitConfiguration(unit.TestUnitControl): """), 'unicode number')
def test_json_listeners(self):
+ self.assertTry('assertIn', 'listener empty', 'error',
+ self.put('/listeners', '{"*:7080":{}}'))
self.assertIn('error', self.put('/listeners',
'{"*:7080":{"application":"app"}}'), 'listeners no app')
@@ -116,24 +142,5 @@ class TestUnitConfiguration(unit.TestUnitControl): self.assertIn('error', self.put('/listeners',
'{"127.0.0.1":{"application":"app"}}'), 'listeners no port')
- @unittest.skip("TODO")
- def test_broken(self):
- self.assertIn('error', self.put('/', '00'), 'leading zero')
- self.assertIn('error', self.put('/listeners', '{"*:7080":{}}'),
- 'listener empty')
- self.assertIn('error', self.put('/applications', '"type":"python"'),
- 'application type only')
-
- self.assertIn('error', self.put('/applications', """
- {
- "app": {
- "type": "python",
- "workers": -1,
- "path": "/app",
- "module": "wsgi"
- }
- }
- """), 'negative workers')
-
if __name__ == '__main__':
unittest.main()
diff --git a/test/unit.py b/test/unit.py index 1bd927f3..b510b42c 100644 --- a/test/unit.py +++ b/test/unit.py @@ -27,6 +27,10 @@ class TestUnit(unittest.TestCase): if '--leave' not in sys.argv:
shutil.rmtree(self.testdir)
+ def assertTry(self, assert_method, description, *args):
+ try: getattr(self, assert_method)(*args, description)
+ except AssertionError: print('not yet: ' + description)
+
def check_modules(self, *modules):
self._run()
|