technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: port range changed to 7xxx.

Browse Source
This commit is contained in:
Andrey Zelenkov
2017-12-06 15:34:58 +03:00
parent 078d44ea71
commit 79b1d4f5ff
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/test_basic.py
View File

@@ -60,22 +60,22 @@ class TestUnitBasic(unit.TestUnitControl):
self.assertEqual(self.get('/applications/app/workers'), 1, self.assertEqual(self.get('/applications/app/workers'), 1,
'python applications workers') 'python applications workers')
self.put('/listeners', '{"*:8080":{"application":"app"}}') self.put('/listeners', '{"*:7080":{"application":"app"}}')
self.assertEqual(self.get()['listeners'], self.assertEqual(self.get()['listeners'],
{"*:8080":{"application":"app"}}, 'python listeners') {"*:7080":{"application":"app"}}, 'python listeners')
self.assertEqual(self.get('/listeners'), self.assertEqual(self.get('/listeners'),
{"*:8080":{"application":"app"}}, 'python listeners prefix') {"*:7080":{"application":"app"}}, 'python listeners prefix')
self.assertEqual(self.get('/listeners/*:8080'), self.assertEqual(self.get('/listeners/*:7080'),
{"application":"app"}, 'python listeners prefix 2') {"application":"app"}, 'python listeners prefix 2')
self.assertEqual(self.get('/listeners/*:8080/application'), 'app', self.assertEqual(self.get('/listeners/*:7080/application'), 'app',
'python listeners application') 'python listeners application')
def test_put(self): def test_put(self):
self.put('/', """ self.put('/', """
{ {
"listeners": { "listeners": {
"*:8080": { "*:7080": {
"application": "app" "application": "app"
} }
}, },
@@ -92,7 +92,7 @@ class TestUnitBasic(unit.TestUnitControl):
resp = self.get() resp = self.get()
self.assertEqual(resp['listeners'], {"*:8080":{"application":"app"}}, self.assertEqual(resp['listeners'], {"*:7080":{"application":"app"}},
'put listeners') 'put listeners')
self.assertEqual(resp['applications'], self.assertEqual(resp['applications'],
@@ -106,18 +106,18 @@ class TestUnitBasic(unit.TestUnitControl):
}, },
'put applications') 'put applications')
self.put('/listeners', '{"*:8081":{"application":"app"}}') self.put('/listeners', '{"*:7081":{"application":"app"}}')
self.assertEqual(self.get('/listeners'), self.assertEqual(self.get('/listeners'),
{"*:8081": {"application":"app"}}, 'put listeners prefix') {"*:7081": {"application":"app"}}, 'put listeners prefix')
self.put('/listeners/*:8082', '{"application":"app"}') self.put('/listeners/*:7082', '{"application":"app"}')
self.assertEqual(self.get('/listeners'), self.assertEqual(self.get('/listeners'),
{ {
"*:8081": { "*:7081": {
"application": "app" "application": "app"
}, },
"*:8082": { "*:7082": {
"application": "app" "application": "app"
} }
}, },
@@ -135,7 +135,7 @@ class TestUnitBasic(unit.TestUnitControl):
self.put('/', """ self.put('/', """
{ {
"listeners": { "listeners": {
"*:8080": { "*:7080": {
"application": "app" "application": "app"
} }
}, },
@@ -152,7 +152,7 @@ class TestUnitBasic(unit.TestUnitControl):
self.assertIn('error', self.delete('/applications/app'), self.assertIn('error', self.delete('/applications/app'),
'delete app before listener') 'delete app before listener')
self.assertIn('success', self.delete('/listeners/*:8080'), self.assertIn('success', self.delete('/listeners/*:7080'),
'delete listener') 'delete listener')
self.assertIn('success', self.delete('/applications/app'), self.assertIn('success', self.delete('/applications/app'),
'delete app after listener') 'delete app after listener')

10
test/test_configuration.py
View File

@@ -91,7 +91,7 @@ class TestUnitConfiguration(unit.TestUnitControl):
def test_json_listeners(self): def test_json_listeners(self):
self.assertIn('error', self.put('/listeners', self.assertIn('error', self.put('/listeners',
'{"*:8080":{"application":"app"}}'), 'listeners no app') '{"*:7080":{"application":"app"}}'), 'listeners no app')
self.put('/applications', """ self.put('/applications', """
{ {
@@ -105,18 +105,18 @@ class TestUnitConfiguration(unit.TestUnitControl):
""") """)
self.assertIn('success', self.put('/listeners', self.assertIn('success', self.put('/listeners',
'{"*:8080":{"application":"app"}}'), 'listeners wildcard') '{"*:7080":{"application":"app"}}'), 'listeners wildcard')
self.assertIn('success', self.put('/listeners', self.assertIn('success', self.put('/listeners',
'{"127.0.0.1:8081":{"application":"app"}}'), 'listeners explicit') '{"127.0.0.1:7081":{"application":"app"}}'), 'listeners explicit')
self.assertIn('success', self.put('/listeners', self.assertIn('success', self.put('/listeners',
'{"[::1]:8082":{"application":"app"}}'), 'listeners explicit ipv6') '{"[::1]:7082":{"application":"app"}}'), 'listeners explicit ipv6')
self.assertIn('error', self.put('/listeners', self.assertIn('error', self.put('/listeners',
'{"127.0.0.1":{"application":"app"}}'), 'listeners no port') '{"127.0.0.1":{"application":"app"}}'), 'listeners no port')
@unittest.skip("TODO") @unittest.skip("TODO")
def test_broken(self): def test_broken(self):
self.assertIn('error', self.put('/', '00'), 'leading zero') self.assertIn('error', self.put('/', '00'), 'leading zero')
self.assertIn('error', self.put('/listeners', '{"*:8080":{}}'), self.assertIn('error', self.put('/listeners', '{"*:7080":{}}'),
'listener empty') 'listener empty')
self.assertIn('error', self.put('/applications', '"type":"python"'), self.assertIn('error', self.put('/applications', '"type":"python"'),
'application type only') 'application type only')