ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-20 00:03:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
This commit is contained in:
grossmj
2018-08-29 15:57:54 +07:00
parent 9ef23ce6a8 b7dd8b5176
commit 33e8710495
43 changed files with 362 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/compute/qemu/test_qemu_vm.py
View File

@ -166,9 +166,9 @@ def test_termination_callback(vm, async_run):
async_run(vm._termination_callback(0))
assert vm.status == "stopped"
async_run(queue.get(0)) #  Ping
async_run(queue.get(1)) #  Ping
(action, event, kwargs) = async_run(queue.get(0))
(action, event, kwargs) = async_run(queue.get(1))
assert action == "node.updated"
assert event == vm
@ -186,7 +186,7 @@ def test_termination_callback_error(vm, tmpdir, async_run):
async_run(vm._termination_callback(1))
assert vm.status == "stopped"
async_run(queue.get(0)) # Ping
async_run(queue.get(1)) # Ping
(action, event, kwargs) = queue.get_nowait()
assert action == "node.updated"