Use base_dir as the project root directory

This commit is contained in:
Sheng
2018-08-18 17:39:50 +08:00
parent d6de1340c4
commit f4197f0e4c
7 changed files with 38 additions and 35 deletions
+6 -8
View File
@@ -1,4 +1,5 @@
import json
import os.path
import random
import threading
import tornado.websocket
@@ -8,10 +9,10 @@ import webssh.handler as handler
from tornado.testing import AsyncHTTPTestCase
from tornado.httpclient import HTTPError
from tornado.options import options
from webssh.main import make_app, make_handlers
from webssh.settings import get_app_settings, max_body_size
from tests.sshserver import run_ssh_server, banner
from tests.utils import encode_multipart_formdata
from tests.utils import encode_multipart_formdata, read_file
from webssh.main import make_app, make_handlers
from webssh.settings import get_app_settings, max_body_size, base_dir
handler.DELAY = 0.1
@@ -52,9 +53,6 @@ class TestApp(AsyncHTTPTestCase):
cls.running.pop()
print('='*20)
def read_privatekey(self, filename):
return open(filename, 'rb').read().decode('utf-8')
def get_httpserver_options(self):
options = super(TestApp, self).get_httpserver_options()
options.update(max_body_size=max_body_size)
@@ -126,7 +124,7 @@ class TestApp(AsyncHTTPTestCase):
response = yield client.fetch(url)
self.assertEqual(response.code, 200)
privatekey = self.read_privatekey('tests/user_rsa_key')
privatekey = read_file(os.path.join(base_dir, 'tests', 'user_rsa_key'))
files = [('privatekey', 'user_rsa_key', privatekey)]
content_type, body = encode_multipart_formdata(self.body_dict.items(),
files)
@@ -154,7 +152,7 @@ class TestApp(AsyncHTTPTestCase):
response = yield client.fetch(url)
self.assertEqual(response.code, 200)
privatekey = self.read_privatekey('tests/user_rsa_key')
privatekey = read_file(os.path.join(base_dir, 'tests', 'user_rsa_key'))
privatekey = privatekey[:100] + u'bad' + privatekey[100:]
files = [('privatekey', 'user_rsa_key', privatekey)]
content_type, body = encode_multipart_formdata(self.body_dict.items(),