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

Correctly check if qemu is running

Browse Source 
Fixes #71
Related to #70
This commit is contained in:
Julien Duponchelle 2015-02-25 15:42:01 +01:00
parent 0713724a97
commit 4ea25739e5
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/modules/qemu/qemu_vm.py
View File

@ -805,7 +805,11 @@ class QemuVM(BaseVM):
""" """
if self._process: if self._process:
return True print(self._process.returncode)
if self._process.returncode is None:
return True
else:
self._process = None
return False return False
def command(self): def command(self):

29
tests/modules/qemu/test_qemu_vm.py
View File

@ -62,20 +62,37 @@ def vm(project, manager, fake_qemu_binary, fake_qemu_img_binary):
return QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path=fake_qemu_binary) return QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path=fake_qemu_binary)
@pytest.fixture(scope="function")
def running_subprocess_mock():
mm = MagicMock()
mm.returncode = None
return mm
def test_vm(project, manager, fake_qemu_binary): def test_vm(project, manager, fake_qemu_binary):
vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path=fake_qemu_binary) vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path=fake_qemu_binary)
assert vm.name == "test" assert vm.name == "test"
assert vm.id == "00010203-0405-0607-0809-0a0b0c0d0e0f" assert vm.id == "00010203-0405-0607-0809-0a0b0c0d0e0f"
def test_start(loop, vm): def test_is_running(vm, running_subprocess_mock):
with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
vm._process = None
assert vm.is_running() is False
vm._process = running_subprocess_mock
assert vm.is_running()
vm._process.returncode = -1
assert vm.is_running() is False
def test_start(loop, vm, running_subprocess_mock):
with asyncio_patch("asyncio.create_subprocess_exec", return_value=running_subprocess_mock):
loop.run_until_complete(asyncio.async(vm.start())) loop.run_until_complete(asyncio.async(vm.start()))
assert vm.is_running() assert vm.is_running()
def test_stop(loop, vm): def test_stop(loop, vm, running_subprocess_mock):
process = MagicMock() process = running_subprocess_mock
# Wait process kill success # Wait process kill success
future = asyncio.Future() future = asyncio.Future()
@ -217,9 +234,9 @@ def test_control_vm(vm, loop):
assert res is None assert res is None
def test_control_vm_expect_text(vm, loop): def test_control_vm_expect_text(vm, loop, running_subprocess_mock):
vm._process = MagicMock() vm._process = running_subprocess_mock
vm._monitor = 4242 vm._monitor = 4242
reader = MagicMock() reader = MagicMock()
writer = MagicMock() writer = MagicMock()