From 8ec11619cdb0cf7a62b8d8155cb69835bf03a1d9 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 28 Jun 2016 22:23:34 +0200 Subject: [PATCH] Full symbol support on server Fix #496 --- gns3server/controller/symbols.py | 2 +- gns3server/handlers/api/controller/symbol_handler.py | 3 ++- tests/handlers/api/controller/test_symbol.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index d1cf7c37..894f4b8b 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -54,7 +54,7 @@ class Symbols: 'filename': file, 'builtin': False, }) - self._symbols_path[symbol_id] = os.path.join(get_resource("symbols"), file) + self._symbols_path[symbol_id] = os.path.join(directory, file) symbols.sort(key=lambda x: x["filename"]) diff --git a/gns3server/handlers/api/controller/symbol_handler.py b/gns3server/handlers/api/controller/symbol_handler.py index c6237836..7379cff9 100644 --- a/gns3server/handlers/api/controller/symbol_handler.py +++ b/gns3server/handlers/api/controller/symbol_handler.py @@ -68,5 +68,6 @@ class SymbolHandler: if not packet: break f.write(packet) + # Reset the symbol list + controller.symbols.list() response.set_status(204) - diff --git a/tests/handlers/api/controller/test_symbol.py b/tests/handlers/api/controller/test_symbol.py index 8b2b0cec..4ef0c78a 100644 --- a/tests/handlers/api/controller/test_symbol.py +++ b/tests/handlers/api/controller/test_symbol.py @@ -49,4 +49,5 @@ def test_upload(http_controller, symbols_dir): with open(os.path.join(symbols_dir, "test2")) as f: assert f.read() == "TEST" - + response = http_controller.get('/symbols/test2/raw') + assert response.status == 200