Merge branch '2.1' into embed_shell

tests/compute/qemu/test_qemu_manager.py

@@ -178,6 +178,26 @@ def test_create_image_exist(loop, tmpdir, fake_qemu_img_binary):
                 assert not process.called
 
 
+def test_create_image_with_not_supported_characters_by_filesystem(loop, tmpdir, fake_qemu_img_binary):
+    open(str(tmpdir / "hda.qcow2"), "w+").close()
+
+    options = {
+        "format": "raw",
+        "size": 100
+    }
+
+    # patching os.makedirs is necessary as it depends on already mocked os.path.exists
+    with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process, \
+            patch("gns3server.compute.qemu.Qemu.get_images_directory", return_value=str(tmpdir)), \
+            patch("os.path.exists", side_effect=UnicodeEncodeError('error', u"", 1, 2, 'Emulated Unicode Err')),\
+            patch("os.makedirs"):
+
+        with pytest.raises(QemuError):
+            loop.run_until_complete(asyncio.async(Qemu.instance().create_disk(
+                fake_qemu_img_binary, "hda.qcow2", options)))
+            assert not process.called
+
+
 def test_get_kvm_archs_kvm_ok(loop):
 
     with patch("os.path.exists", return_value=True):
@@ -185,7 +205,7 @@ def test_get_kvm_archs_kvm_ok(loop):
         if platform.machine() == 'x86_64':
             assert archs == ['x86_64', 'i386']
         else:
-            assert archs == [ platform.machine() ]
+            assert archs == [platform.machine()]
 
     with patch("os.path.exists", return_value=False):
         archs = loop.run_until_complete(asyncio.async(Qemu.get_kvm_archs()))

tests/compute/virtualbox/test_virtualbox_vm.py

@@ -113,3 +113,15 @@ def test_patch_vm_uuid(vm):
     with open(vm._linked_vbox_file()) as f:
         c = f.read()
         assert "{" + vm.id + "}" in c
+
+
+def test_patch_vm_uuid_with_corrupted_file(vm):
+    xml = """<?xml version="1.0"?>
+    <VirtualBox>
+    """
+    os.makedirs(os.path.join(vm.working_dir, vm._vmname), exist_ok=True)
+    with open(vm._linked_vbox_file(), "w+") as f:
+        f.write(xml)
+    vm._linked_clone = True
+    with pytest.raises(VirtualBoxError):
+        vm._patch_vm_uuid()

tests/compute/vpcs/test_vpcs_vm.py

@@ -251,6 +251,12 @@ def test_update_startup_script_h(vm):
         assert f.read() == "set pcname pc1\n"
 
 
+def test_update_startup_script_with_escaping_characters_in_name(vm):
+    vm.startup_script = "set pcname initial-name\n"
+    vm.name = "test\\"
+    assert vm.startup_script == "set pcname test\\\n"
+
+
 def test_get_startup_script(vm):
     content = "echo GNS3 VPCS\nip 192.168.1.2"
     vm.startup_script = content