Use pytest-asyncio auto mode

This commit is contained in:
grossmj committed 2022-08-27 21:10:17 +02:00
1 parent 600c18f04b
commit fc7d5be736
28 files changed
+36 -60

No files matched your search

+1 -2
View File
@@ -17,7 +17,6 @@
import uuid
import pytest
import pytest_asyncio
from unittest.mock import MagicMock, patch, call
from gns3server.compute.builtin.nodes.cloud import Cloud
@@ -31,7 +30,7 @@ def nio():
return NIOUDP(4242, "127.0.0.1", 4343)
@pytest_asyncio.fixture
@pytest.fixture
async def manager():
m = MagicMock()
+1 -2
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from unittest.mock import MagicMock, patch
from tests.utils import asyncio_patch, AsyncioMagicMock
@@ -24,7 +23,7 @@ from gns3server.compute.docker import Docker, DOCKER_PREFERRED_API_VERSION, DOCK
from gns3server.compute.docker.docker_error import DockerError, DockerHttp404Error
@pytest_asyncio.fixture
@pytest.fixture
async def vm():
vm = Docker()
@@ -17,7 +17,6 @@
import pytest
import pytest_asyncio
import tempfile
import sys
import uuid
@@ -29,7 +28,7 @@ from unittest.mock import patch
from tests.utils import asyncio_patch, AsyncioMagicMock
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = Dynamips.instance()
@@ -18,7 +18,6 @@
import os
import uuid
import pytest
import pytest_asyncio
from gns3server.compute.dynamips.nodes.router import Router
from gns3server.compute.dynamips.dynamips_error import DynamipsError
@@ -26,7 +25,7 @@ from gns3server.compute.dynamips import Dynamips
from gns3server.config import Config
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = Dynamips.instance()
+1 -2
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import stat
@@ -37,7 +36,7 @@ if not sys.platform.startswith("win"):
from gns3server.compute.iou import IOU
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = IOU.instance()
+1 -2
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import sys
@@ -34,7 +33,7 @@ from gns3server.utils import force_unix_path, macaddress_to_int, int_to_macaddre
from gns3server.compute.notification_manager import NotificationManager
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = Qemu.instance()
+1 -2
View File
@@ -18,7 +18,6 @@
from collections import OrderedDict
import pytest
import pytest_asyncio
from tests.utils import asyncio_patch, AsyncioMagicMock
@@ -29,7 +28,7 @@ from gns3server.compute.vpcs import VPCS
from gns3server.compute.nios.nio_udp import NIOUDP
@pytest_asyncio.fixture(scope="function")
@pytest.fixture(scope="function")
async def manager(port_manager):
m = VPCS.instance()
+2 -3
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
from tests.utils import asyncio_patch, AsyncioMagicMock
@@ -28,7 +27,7 @@ from gns3server.compute.traceng import TraceNG
from gns3server.compute.notification_manager import NotificationManager
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = TraceNG.instance()
@@ -36,7 +35,7 @@ async def manager(port_manager):
return m
@pytest_asyncio.fixture(scope="function")
@pytest.fixture(scope="function")
async def vm(compute_project, manager, ubridge_path):
vm = TraceNGVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
@@ -17,7 +17,6 @@
import pytest
import pytest_asyncio
import tempfile
import os
import stat
@@ -29,7 +28,7 @@ from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
from tests.utils import asyncio_patch
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = VirtualBox.instance()
@@ -17,7 +17,6 @@
import os
import pytest
import pytest_asyncio
from tests.utils import asyncio_patch, AsyncioMagicMock
from gns3server.compute.virtualbox.virtualbox_vm import VirtualBoxVM
@@ -25,7 +24,7 @@ from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
from gns3server.compute.virtualbox import VirtualBox
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = VirtualBox.instance()
+2 -3
View File
@@ -15,13 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest_asyncio
import pytest
from gns3server.compute.vmware import VMware
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = VMware.instance()
-1
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from gns3server.compute.vmware.vmware_vm import VMwareVM
from gns3server.compute.vmware import VMware
+1 -2
View File
@@ -16,7 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import sys
@@ -31,7 +30,7 @@ from gns3server.compute.vpcs import VPCS
from gns3server.compute.notification_manager import NotificationManager
@pytest_asyncio.fixture
@pytest.fixture
async def manager(port_manager):
m = VPCS.instance()