Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:channelcat/sanic into no_asyncio_global_settings

Browse Source
This commit is contained in:
Eli Uriegas 2017-02-02 10:04:17 -06:00
commit b2da0aa818
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sanic/app.py
View File

@ -394,6 +394,7 @@ class Sanic:
if debug: if debug:
log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
if self.config.LOGO is not None:
log.debug(self.config.LOGO) log.debug(self.config.LOGO)
return server_settings return server_settings

44
tests/test_static.py
View File

@ -16,47 +16,35 @@ def static_file_directory():
return static_directory return static_directory
@pytest.fixture(scope='module') def get_file_path(static_file_directory, file_name):
def static_file_path(static_file_directory): return os.path.join(static_file_directory, file_name)
"""The path to the static file that we want to serve"""
return os.path.join(static_file_directory, 'test.file')
@pytest.fixture(scope='module') def get_file_content(static_file_directory, file_name):
def static_file_content(static_file_path):
"""The content of the static file to check""" """The content of the static file to check"""
with open(static_file_path, 'rb') as file: with open(get_file_path(static_file_directory, file_name), 'rb') as file:
return file.read() return file.read()
def test_static_file(static_file_path, static_file_content): @pytest.mark.parametrize('file_name', ['test.file', 'decode me.txt'])
def test_static_file(static_file_directory, file_name):
app = Sanic('test_static') app = Sanic('test_static')
app.static('/testing.file', static_file_path) app.static(
'/testing.file', get_file_path(static_file_directory, file_name))
request, response = sanic_endpoint_test(app, uri='/testing.file') request, response = sanic_endpoint_test(app, uri='/testing.file')
assert response.status == 200 assert response.status == 200
assert response.body == static_file_content assert response.body == get_file_content(static_file_directory, file_name)
def test_static_directory( @pytest.mark.parametrize('file_name', ['test.file', 'decode me.txt'])
static_file_directory, static_file_path, static_file_content): @pytest.mark.parametrize('base_uri', ['/static', '', '/dir'])
def test_static_directory(file_name, base_uri, static_file_directory):
app = Sanic('test_static') app = Sanic('test_static')
app.static('/dir', static_file_directory) app.static(base_uri, static_file_directory)
request, response = sanic_endpoint_test(app, uri='/dir/test.file') request, response = sanic_endpoint_test(
app, uri='{}/{}'.format(base_uri, file_name))
assert response.status == 200 assert response.status == 200
assert response.body == static_file_content assert response.body == get_file_content(static_file_directory, file_name)
def test_static_url_decode_file(static_file_directory):
decode_me_path = os.path.join(static_file_directory, 'decode me.txt')
with open(decode_me_path, 'rb') as file:
decode_me_contents = file.read()
app = Sanic('test_static')
app.static('/dir', static_file_directory)
request, response = sanic_endpoint_test(app, uri='/dir/decode me.txt')
assert response.status == 200
assert response.body == decode_me_contents