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

Added test for check_encoding_setting

pull/126/head
Sheng 2020-02-13 10:15:29 +08:00
parent 7110def747
commit 83f739ca35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_settings.py
View File

@ -11,7 +11,8 @@ from tests.utils import make_tests_data_path
from webssh.policy import load_host_keys from webssh.policy import load_host_keys
from webssh.settings import ( from webssh.settings import (
get_host_keys_settings, get_policy_setting, base_dir, get_font_filename, get_host_keys_settings, get_policy_setting, base_dir, get_font_filename,
get_ssl_context, get_trusted_downstream, get_origin_setting, print_version get_ssl_context, get_trusted_downstream, get_origin_setting, print_version,
check_encoding_setting
) )
from webssh.utils import UnicodeType from webssh.utils import UnicodeType
from webssh._version import __version__ from webssh._version import __version__
@ -178,3 +179,9 @@ class TestSettings(unittest.TestCase):
font = 'wrong-name' font = 'wrong-name'
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
get_font_filename(font, font_dir) get_font_filename(font, font_dir)
def test_check_encoding_setting(self):
self.assertIsNone(check_encoding_setting(''))
self.assertIsNone(check_encoding_setting('utf-8'))
with self.assertRaises(ValueError):
check_encoding_setting('unknown-encoding')

1
webssh/settings.py
View File

@ -193,4 +193,3 @@ def get_font_filename(font, font_dir):
def check_encoding_setting(encoding): def check_encoding_setting(encoding):
if encoding and not is_valid_encoding(encoding): if encoding and not is_valid_encoding(encoding):
raise ValueError('Unknown character encoding.') raise ValueError('Unknown character encoding.')
return encoding