Support /static/ files serving, Ref: #1362

This commit is contained in:
ziajka committed 2018-06-22 15:29:47 +02:00
1 parent 96d5e351f7
commit 867e997b74
10 files changed
+151 -4

No files matched your search

+16 -3
View File
@@ -15,13 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import aiohttp
import os
from unittest.mock import patch
from gns3server.version import __version__
from gns3server.controller import Controller
from gns3server.utils.static import get_static_path
def test_index(http_root):
@@ -50,6 +49,20 @@ def test_project(http_root, async_run):
assert response.status == 200
def test_static(http_root, tmpdir):
tmpfile = get_static_path('testing.txt')
with open(tmpfile, 'w+') as f:
f.write('world')
response = http_root.get('/static/testing.txt')
assert response.status == 200
os.remove(tmpfile)
def test_static_not_found(http_root, tmpdir):
response = http_root.get('/static/not-found.txt')
assert response.status == 404
def test_v1(http_root):
"""
The old api v1 raise a 429
-1
View File
@@ -21,7 +21,6 @@ import aiohttp
from gns3server.utils.path import check_path_allowed, get_default_project_directory
from gns3server.utils import force_unix_path
def test_check_path_allowed(config, tmpdir):
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env python
#
# Copyright (C) 2018 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from gns3server.utils.static import get_static_path
def test_get_static_path():
assert get_static_path('test').endswith('gns3server/static/test')
+44
View File
@@ -0,0 +1,44 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2018 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
from unittest.mock import MagicMock
from aiohttp.web import HTTPNotFound
from gns3server.web.response import Response
@pytest.fixture()
def response():
request = MagicMock()
return Response(request=request)
def test_response_file(async_run, tmpdir, response):
filename = str(tmpdir / 'hello')
with open(filename, 'w+') as f:
f.write('world')
async_run(response.file(filename))
assert response.status == 200
def test_response_file_not_found(async_run, tmpdir, response):
filename = str(tmpdir / 'hello-not-found')
pytest.raises(HTTPNotFound, lambda: async_run(response.file(filename)))