Fix tests for Windows

tests/compute/builtin/nodes/test_cloud.py

@@ -31,7 +31,7 @@ def nio():
 
 
 @pytest.fixture
-def manager():
+async def manager(loop):
 
     m = MagicMock()
     m.module_name = "builtins"
@@ -113,7 +113,7 @@ def test_json_without_ports(on_gns3vm, compute_project, manager):
     }
 
 
-async def test_update_port_mappings(on_gns3vm, compute_project):
+async def test_update_port_mappings(loop, on_gns3vm, compute_project):
     """
     We don't allow an empty interface in the middle of port list
     """
@@ -153,7 +153,7 @@ async def test_update_port_mappings(on_gns3vm, compute_project):
     assert cloud.ports_mapping == ports1
 
 
-async def test_linux_ethernet_raw_add_nio(linux_platform, compute_project, nio):
+async def test_linux_ethernet_raw_add_nio(loop, linux_platform, compute_project, nio):
     ports = [
         {
             "interface": "eth0",
@@ -180,7 +180,7 @@ async def test_linux_ethernet_raw_add_nio(linux_platform, compute_project, nio):
     ])
 
 
-async def test_linux_ethernet_raw_add_nio_bridge(linux_platform, compute_project, nio):
+async def test_linux_ethernet_raw_add_nio_bridge(loop, linux_platform, compute_project, nio):
     """
     Bridge can't be connected directly to a cloud we use a tap in the middle
     """

tests/compute/qemu/test_qemu_vm.py

@@ -67,7 +67,7 @@ def fake_qemu_binary(monkeypatch, tmpdir):
 
 
 @pytest.fixture(scope="function")
-async def vm(loop, compute_project, manager, fake_qemu_binary, fake_qemu_img_binary):
+async def vm(compute_project, manager, fake_qemu_binary, fake_qemu_img_binary):
 
     manager.port_manager.console_host = "127.0.0.1"
     vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, qemu_path=fake_qemu_binary)
@@ -87,7 +87,7 @@ def running_subprocess_mock():
     return mm
 
 
-def test_vm(compute_project, manager, fake_qemu_binary):
+async def test_vm(compute_project, manager, fake_qemu_binary):
 
     vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, qemu_path=fake_qemu_binary)
     assert vm.name == "test"
@@ -110,7 +110,7 @@ async def test_vm_create(tmpdir, compute_project, manager, fake_qemu_binary):
     assert os.path.exists(str(tmpdir / 'hello.md5sum'))
 
 
-def test_vm_invalid_qemu_with_platform(compute_project, manager, fake_qemu_binary):
+async def test_vm_invalid_qemu_with_platform(compute_project, manager, fake_qemu_binary):
 
     vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, qemu_path="/usr/fake/bin/qemu-system-64", platform="x86_64")
 
@@ -118,7 +118,7 @@ def test_vm_invalid_qemu_with_platform(compute_project, manager, fake_qemu_binar
     assert vm.platform == "x86_64"
 
 
-def test_vm_invalid_qemu_without_platform(compute_project, manager, fake_qemu_binary):
+async def test_vm_invalid_qemu_without_platform(compute_project, manager, fake_qemu_binary):
 
     vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, qemu_path="/usr/fake/bin/qemu-system-x86_64")
 
@@ -335,7 +335,7 @@ def test_set_qemu_path_kvm_binary(vm, fake_qemu_binary):
     assert vm.platform == "x86_64"
 
 
-def test_set_platform(compute_project, manager):
+async def test_set_platform(compute_project, manager):
 
     with patch("shutil.which", return_value="/bin/qemu-system-x86_64") as which_mock:
         with patch("gns3server.compute.qemu.QemuVM._check_qemu_path"):
@@ -737,7 +737,7 @@ def test_hda_disk_image(vm, images_dir):
     assert vm.hda_disk_image == force_unix_path(os.path.join(images_dir, "QEMU", "test2"))
 
 
-def test_hda_disk_image_non_linked_clone(vm, images_dir, compute_project, manager, fake_qemu_binary):
+async def test_hda_disk_image_non_linked_clone(vm, images_dir, compute_project, manager, fake_qemu_binary):
     """
     Two non linked can't use the same image at the same time
     """

tests/compute/traceng/test_traceng_vm.py

@@ -27,9 +27,8 @@ from gns3server.compute.traceng import TraceNG
 from gns3server.compute.notification_manager import NotificationManager
 
 
-
 @pytest.fixture
-def manager(port_manager):
+async def manager(loop, port_manager):
 
     m = TraceNG.instance()
     m.port_manager = port_manager
@@ -37,7 +36,7 @@ def manager(port_manager):
 
 
 @pytest.fixture(scope="function")
-def vm(loop, compute_project, manager, ubridge_path):
+async def vm(compute_project, manager, ubridge_path):
 
     vm = TraceNGVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
     vm._start_ubridge = AsyncioMagicMock()
@@ -46,7 +45,7 @@ def vm(loop, compute_project, manager, ubridge_path):
     return vm
 
 
-def test_vm(project, manager):
+async def test_vm(project, manager):
 
     vm = TraceNGVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
     assert vm.name == "test"

tests/compute/virtualbox/test_virtualbox_vm.py

@@ -17,7 +17,6 @@
 
 import os
 import pytest
-import asyncio
 from tests.utils import asyncio_patch, AsyncioMagicMock
 
 from gns3server.compute.virtualbox.virtualbox_vm import VirtualBoxVM
@@ -26,7 +25,7 @@ from gns3server.compute.virtualbox import VirtualBox
 
 
 @pytest.fixture
-def manager(loop, port_manager):
+async def manager(loop, port_manager):
 
     m = VirtualBox.instance()
     m.port_manager = port_manager
@@ -34,12 +33,12 @@ def manager(loop, port_manager):
 
 
 @pytest.fixture(scope="function")
-def vm(compute_project, manager):
+async def vm(compute_project, manager):
 
     return VirtualBoxVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, "test", False)
 
 
-def test_vm(compute_project, manager):
+async def test_vm(compute_project, manager):
 
     vm = VirtualBoxVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, "test", False)
     assert vm.name == "test"

tests/compute/vmware/test_vmware_vm.py

@@ -23,7 +23,7 @@ from gns3server.compute.vmware import VMware
 
 
 @pytest.fixture
-def manager(port_manager):
+async def manager(loop, port_manager):
 
     m = VMware.instance()
     m.port_manager = port_manager
@@ -31,20 +31,20 @@ def manager(port_manager):
 
 
 @pytest.fixture(scope="function")
-async def vm(loop, compute_project, manager, tmpdir):
+async def vm(compute_project, manager, tmpdir):
 
     fake_vmx = str(tmpdir / "test.vmx")
     open(fake_vmx, "w+").close()
     return VMwareVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, fake_vmx, False)
 
 
-def test_vm(vm):
+async def test_vm(vm):
 
     assert vm.name == "test"
     assert vm.id == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 
-def test_json(vm, tmpdir, compute_project):
+async def test_json(vm, tmpdir, compute_project):
 
     assert vm.__json__()["node_directory"] is not None
     compute_project._path = str(tmpdir)