arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-03 13:48:11 +00:00
Code Issues Releases Wiki Activity

Fix server close tests

Browse Source
This commit is contained in:
Julien Duponchelle 2015-02-06 11:31:54 +01:00
parent 5c3969ae79
commit 571044b3e8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -500,7 +500,7 @@ class VirtualBoxVM(BaseVM):
self._adapter_start_index = adapter_start_index self._adapter_start_index = adapter_start_index
# TODO: get rid of adapter start index # TODO: get rid of adapter start index
#self.adapters = self.adapters # this forces to recreate the adapter list with the correct index # self.adapters = self.adapters # this forces to recreate the adapter list with the correct index
log.info("VirtualBox VM '{name}' [{id}]: adapter start index changed to {index}".format(name=self.name, log.info("VirtualBox VM '{name}' [{id}]: adapter start index changed to {index}".format(name=self.name,
id=self.id, id=self.id,
index=adapter_start_index)) index=adapter_start_index))

3
tests/modules/test_project.py
View File

@ -24,6 +24,7 @@ import shutil
from uuid import uuid4 from uuid import uuid4
from unittest.mock import patch from unittest.mock import patch
from tests.utils import asyncio_patch
from gns3server.modules.project import Project from gns3server.modules.project import Project
from gns3server.modules.vpcs import VPCS, VPCSVM from gns3server.modules.vpcs import VPCS, VPCSVM
@ -183,7 +184,7 @@ def test_project_close(loop, manager):
project = Project() project = Project()
vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager) vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
project.add_vm(vm) project.add_vm(vm)
with patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.close") as mock: with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.close") as mock:
loop.run_until_complete(asyncio.async(project.close())) loop.run_until_complete(asyncio.async(project.close()))
assert mock.called assert mock.called

3
tests/utils.py
View File

@ -48,7 +48,10 @@ class _asyncio_patch:
def _fake_anwser(self): def _fake_anwser(self):
future = asyncio.Future() future = asyncio.Future()
if "return_value" in self.kwargs:
future.set_result(self.kwargs["return_value"]) future.set_result(self.kwargs["return_value"])
else:
future.set_result(True)
return future return future