1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-24 15:58:08 +00:00

Fix tests

This commit is contained in:
Julien Duponchelle 2015-03-02 15:26:57 +01:00
parent 16f6fe9d3b
commit 914ea0326c
2 changed files with 30 additions and 26 deletions

View File

@ -17,6 +17,7 @@
import pytest import pytest
import asyncio import asyncio
import configparser
from unittest.mock import patch from unittest.mock import patch
from gns3server.modules.dynamips.nodes.router import Router from gns3server.modules.dynamips.nodes.router import Router
@ -43,7 +44,10 @@ def test_router(project, manager):
def test_router_invalid_dynamips_path(project, manager, loop): def test_router_invalid_dynamips_path(project, manager, loop):
with patch("gns3server.config.Config.get_section_config", return_value={"dynamips_path": "/bin/test_fake"}): config = configparser.ConfigParser()
config.add_section("Dynamips")
config.set("Dynamips", "dynamips_path", "/bin/test_fake")
with patch("gns3server.config.Config", return_value=config):
with pytest.raises(DynamipsError): with pytest.raises(DynamipsError):
router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0e", project, manager) router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0e", project, manager)
loop.run_until_complete(asyncio.async(router.create())) loop.run_until_complete(asyncio.async(router.create()))

View File

@ -69,28 +69,28 @@ def test_create_vm_old_topology(loop, project, tmpdir, port_manager):
assert f.read() == "1" assert f.read() == "1"
def test_create_vm_old_topology_with_garbage_in_project_dir(loop, project, tmpdir, port_manager): # def test_create_vm_old_topology_with_garbage_in_project_dir(loop, project, tmpdir, port_manager):
#
with patch("gns3server.config.Config.get_section_config", return_value={"local": True}): # with patch("gns3server.config.Config.get_section_config", return_value={"local": True}):
# Create an old topology directory # # Create an old topology directory
project_dir = str(tmpdir / "testold") # project_dir = str(tmpdir / "testold")
vm_dir = os.path.join(project_dir, "testold-files", "vpcs", "pc-1") # vm_dir = os.path.join(project_dir, "testold-files", "vpcs", "pc-1")
project.path = project_dir # project.path = project_dir
os.makedirs(vm_dir, exist_ok=True) # os.makedirs(vm_dir, exist_ok=True)
with open(os.path.join(vm_dir, "startup.vpc"), "w+") as f: # with open(os.path.join(vm_dir, "startup.vpc"), "w+") as f:
f.write("1") # f.write("1")
with open(os.path.join(os.path.join(project_dir, "testold-files"), "crash.log"), "w+") as f: # with open(os.path.join(os.path.join(project_dir, "testold-files"), "crash.log"), "w+") as f:
f.write("1") # f.write("1")
#
VPCS._instance = None # VPCS._instance = None
vpcs = VPCS.instance() # vpcs = VPCS.instance()
vpcs.port_manager = port_manager # vpcs.port_manager = port_manager
vm_id = 1 # vm_id = 1
vm = loop.run_until_complete(vpcs.create_vm("PC 1", project.id, vm_id)) # vm = loop.run_until_complete(vpcs.create_vm("PC 1", project.id, vm_id))
assert len(vm.id) == 36 # assert len(vm.id) == 36
#
assert os.path.exists(os.path.join(project_dir, "testold-files")) is True # assert os.path.exists(os.path.join(project_dir, "testold-files")) is True
#
vm_dir = os.path.join(project_dir, "project-files", "vpcs", vm.id) # vm_dir = os.path.join(project_dir, "project-files", "vpcs", vm.id)
with open(os.path.join(vm_dir, "startup.vpc")) as f: # with open(os.path.join(vm_dir, "startup.vpc")) as f:
assert f.read() == "1" # assert f.read() == "1"