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

Fix qemu tests

Browse Source
This commit is contained in:
Julien Duponchelle 2015-07-23 10:46:43 +02:00
parent e07c3215f5
commit 3f25bfcb27
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1004,7 +1004,6 @@ class QemuVM(BaseVM):
@asyncio.coroutine @asyncio.coroutine
def _disk_options(self): def _disk_options(self):
options = [] options = []
qemu_img_path = "" qemu_img_path = ""
qemu_path_dir = os.path.dirname(self.qemu_path) qemu_path_dir = os.path.dirname(self.qemu_path)

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

@ -269,13 +269,16 @@ def test_set_platform(project, manager):
assert vm.qemu_path == "/bin/qemu-system-x86_64" assert vm.qemu_path == "/bin/qemu-system-x86_64"
def test_disk_options(vm, loop, fake_qemu_img_binary): def test_disk_options(vm, tmpdir, loop, fake_qemu_img_binary):
vm._hda_disk_image = str(tmpdir / "test.qcow2")
open(vm._hda_disk_image, "w+").close()
with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process: with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process:
loop.run_until_complete(asyncio.async(vm._disk_options())) loop.run_until_complete(asyncio.async(vm._disk_options()))
assert process.called assert process.called
args, kwargs = process.call_args args, kwargs = process.call_args
assert args == (fake_qemu_img_binary, "create", "-f", "qcow2", os.path.join(vm.working_dir, "flash.qcow2"), "256M") assert args == (fake_qemu_img_binary, "create", "-o", "backing_file={}".format(vm._hda_disk_image), "-f", "qcow2", os.path.join(vm.working_dir, "hda_disk.qcow2"))
@pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows") @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
@ -337,8 +340,6 @@ def test_build_command(vm, loop, fake_qemu_binary, port_manager):
"test", "test",
"-m", "-m",
"256", "256",
"-hda",
os.path.join(vm.working_dir, "flash.qcow2"),
"-serial", "-serial",
"telnet:127.0.0.1:{},server,nowait".format(vm.console), "telnet:127.0.0.1:{},server,nowait".format(vm.console),
"-net", "-net",