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

Tests: small fixes.

Browse Source
This commit is contained in:
Andrey Zelenkov
2018-01-30 16:16:42 +03:00
parent cb80be00a5
commit f115cb7032
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_configuration.py
View File

@@ -158,7 +158,7 @@ class TestUnitConfiguration(unit.TestUnitControl):
self.assertIn('success', self.put('/', """ self.assertIn('success', self.put('/', """
{ {
"listeners": { "listeners": {
"127.0.0.1:7081": { "127.0.0.1:7080": {
"application":"app" "application":"app"
} }
}, },
@@ -177,7 +177,7 @@ class TestUnitConfiguration(unit.TestUnitControl):
self.assertIn('success', self.put('/', """ self.assertIn('success', self.put('/', """
{ {
"listeners": { "listeners": {
"[::1]:7082": { "[::1]:7080": {
"application":"app" "application":"app"
} }
}, },

24
test/test_python_application.py
View File

@@ -35,15 +35,12 @@ def application(environ, start_response):
content_length = int(environ.get('CONTENT_LENGTH', 0)) content_length = int(environ.get('CONTENT_LENGTH', 0))
body = bytes(environ['wsgi.input'].read(content_length)) body = bytes(environ['wsgi.input'].read(content_length))
start_response('200 OK', [ start_response('200', [
('Content-Type', environ.get('CONTENT_TYPE')), ('Content-Type', environ.get('CONTENT_TYPE')),
('Content-Length', str(len(body))), ('Content-Length', str(len(body))),
('Request-Method', environ.get('REQUEST_METHOD')), ('Request-Method', environ.get('REQUEST_METHOD')),
('Request-Uri', environ.get('REQUEST_URI')), ('Request-Uri', environ.get('REQUEST_URI')),
('Path-Info', environ.get('PATH_INFO')),
('Http-Host', environ.get('HTTP_HOST')), ('Http-Host', environ.get('HTTP_HOST')),
('Remote-Addr', environ.get('REMOTE_ADDR')),
('Server-Name', environ.get('SERVER_NAME')),
('Server-Protocol', environ.get('SERVER_PROTOCOL')), ('Server-Protocol', environ.get('SERVER_PROTOCOL')),
('Custom-Header', environ.get('HTTP_CUSTOM_HEADER')) ('Custom-Header', environ.get('HTTP_CUSTOM_HEADER'))
]) ])
@@ -71,25 +68,19 @@ def application(environ, start_response):
'Content-Type': 'text/html', 'Content-Type': 'text/html',
'Request-Method': 'POST', 'Request-Method': 'POST',
'Request-Uri': '/', 'Request-Uri': '/',
'Path-Info': '/',
'Http-Host': 'localhost', 'Http-Host': 'localhost',
'Server-Name': 'localhost',
'Remote-Addr': '127.0.0.1',
'Server-Protocol': 'HTTP/1.1', 'Server-Protocol': 'HTTP/1.1',
'Custom-Header': 'blah' 'Custom-Header': 'blah'
}, 'headers') }, 'headers')
self.assertEqual(r.content, str.encode(body), 'body') self.assertEqual(r.content, body.encode(), 'body')
def test_python_application_query_string(self): def test_python_application_query_string(self):
code, name = """ code, name = """
def application(environ, start_response): def application(environ, start_response):
start_response('200 OK', [ start_response('200', [
('Content-Length', '0'), ('Content-Length', '0'),
('Request-Method', environ.get('REQUEST_METHOD')),
('Request-Uri', environ.get('REQUEST_URI')),
('Path-Info', environ.get('PATH_INFO')),
('Query-String', environ.get('QUERY_STRING')) ('Query-String', environ.get('QUERY_STRING'))
]) ])
return [] return []
@@ -108,10 +99,7 @@ def application(environ, start_response):
headers.pop('Server') headers.pop('Server')
self.assertDictEqual(headers, { self.assertDictEqual(headers, {
'Content-Length': '0', 'Content-Length': '0',
'Request-Method': 'GET', 'Query-String': 'var1=val1&var2=val2'
'Query-String': 'var1=val1&var2=val2',
'Request-Uri': '/?var1=val1&var2=val2',
'Path-Info': '/'
}, 'headers') }, 'headers')
@unittest.expectedFailure @unittest.expectedFailure
@@ -120,8 +108,8 @@ def application(environ, start_response):
def application(environ, start_response): def application(environ, start_response):
start_response('200 OK', [ start_response('200', [
('Content-Type', 'text/html'), ('Content-Length', '0'),
('Server-Port', environ.get('SERVER_PORT')) ('Server-Port', environ.get('SERVER_PORT'))
]) ])
return [] return []

2
test/test_python_atexit.py
View File

@@ -21,7 +21,7 @@ def create_file():
atexit.register(create_file) atexit.register(create_file)
def application(env, start_response): def application(env, start_response):
start_response('200 OK', [('Content-Type','text/html')]) start_response('200', [('Content-Length', '0')])
return [] return []
""" % (self.testdir + '/atexit'), 'py_app' """ % (self.testdir + '/atexit'), 'py_app'