From 46b022f72630a3bbb1a4f64114451ccde1622c7a Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 27 Aug 2022 23:45:30 +0200 Subject: [PATCH] Restore missing loop --- tests/compute/vmware/test_vmware_manager.py | 2 +- tests/compute/vmware/test_vmware_vm.py | 2 +- tests/conftest.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/compute/vmware/test_vmware_manager.py b/tests/compute/vmware/test_vmware_manager.py index 336ede54..9953d1e8 100644 --- a/tests/compute/vmware/test_vmware_manager.py +++ b/tests/compute/vmware/test_vmware_manager.py @@ -21,7 +21,7 @@ from gns3server.compute.vmware import VMware @pytest.fixture -async def manager(port_manager): +async def manager(loop, port_manager): m = VMware.instance() m.port_manager = port_manager diff --git a/tests/compute/vmware/test_vmware_vm.py b/tests/compute/vmware/test_vmware_vm.py index fa4b8fa3..d160e245 100644 --- a/tests/compute/vmware/test_vmware_vm.py +++ b/tests/compute/vmware/test_vmware_vm.py @@ -30,7 +30,7 @@ async def manager(loop, 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() diff --git a/tests/conftest.py b/tests/conftest.py index 05cef8a4..7311b7e6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -29,9 +29,9 @@ if sys.platform.startswith("win"): """Return an event loop and destroy it at the end of test""" loop = asyncio.ProactorEventLoop() - asyncio.set_loop(loop) # Replace main loop to avoid conflict between tests + asyncio.set_event_loop(loop) # Replace main loop to avoid conflict between tests yield loop - asyncio.set_loop(None) + asyncio.set_event_loop(None) @pytest.fixture(scope='function')