jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass server settings for test

pull/38/head
Sheng 2018-10-15 21:36:54 +08:00
parent 021a3a627f
commit 12f4c0d0d2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_app.py
View File

@ -12,7 +12,7 @@ from tests.sshserver import run_ssh_server, banner
from tests.utils import encode_multipart_formdata, read_file, make_tests_data_path # noqa from tests.utils import encode_multipart_formdata, read_file, make_tests_data_path # noqa
from webssh.main import make_app, make_handlers from webssh.main import make_app, make_handlers
from webssh.settings import ( from webssh.settings import (
get_app_settings, max_body_size, swallow_http_errors get_app_settings, get_server_settings, max_body_size, swallow_http_errors
) )
from webssh.utils import to_str from webssh.utils import to_str
@ -45,6 +45,7 @@ class TestAppBasic(AsyncHTTPTestCase):
options.policy = random.choice(['warning', 'autoadd']) options.policy = random.choice(['warning', 'autoadd'])
options.hostFile = '' options.hostFile = ''
options.sysHostFile = '' options.sysHostFile = ''
options.proxies = ''
app = make_app(make_handlers(loop, options), get_app_settings(options)) app = make_app(make_handlers(loop, options), get_app_settings(options))
return app return app
@ -63,9 +64,7 @@ class TestAppBasic(AsyncHTTPTestCase):
print('='*20) print('='*20)
def get_httpserver_options(self): def get_httpserver_options(self):
options = super(TestAppBasic, self).get_httpserver_options() return get_server_settings(options)
options.update(max_body_size=max_body_size)
return options
def assert_response(self, bstr, response): def assert_response(self, bstr, response):
if swallow_http_errors: if swallow_http_errors:
@ -443,8 +442,9 @@ class OtherTestBase(AsyncHTTPTestCase):
headers = {'Cookie': '_xsrf=yummy'} headers = {'Cookie': '_xsrf=yummy'}
debug = False debug = False
policy = None policy = None
hostFile = None hostFile = ''
sysHostFile = None sysHostFile = ''
proxies = ''
body = { body = {
'hostname': '127.0.0.1', 'hostname': '127.0.0.1',
'port': '', 'port': '',
@ -458,11 +458,15 @@ class OtherTestBase(AsyncHTTPTestCase):
loop = self.io_loop loop = self.io_loop
options.debug = self.debug options.debug = self.debug
options.policy = self.policy if self.policy else random.choice(['warning', 'autoadd']) # noqa options.policy = self.policy if self.policy else random.choice(['warning', 'autoadd']) # noqa
options.hostFile = self.hostFile if self.hostFile else '' options.hostFile = self.hostFile
options.sysHostFile = self.sysHostFile if self.sysHostFile else '' options.sysHostFile = self.sysHostFile
options.proxies = self.proxies
app = make_app(make_handlers(loop, options), get_app_settings(options)) app = make_app(make_handlers(loop, options), get_app_settings(options))
return app return app
def get_httpserver_options(self):
return get_server_settings(options)
def setUp(self): def setUp(self):
print('='*20) print('='*20)
self.running = True self.running = True