arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-12 19:38:57 +00:00
Code Issues Releases Wiki Activity

Upgrade dev dependencies and fix tests to support pytest-asyncio strict mode

Browse Source
This commit is contained in:
grossmj 2022-08-24 21:03:16 +02:00
parent 2e91eac1eb
commit 86c44cd6e7
39 changed files with 100 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev-requirements.txt
View File

@ -1,8 +1,8 @@
-r requirements.txt
pytest==7.0.0
flake8==4.0.1
pytest-timeout==2.0.1
pytest-asyncio==0.16.0
requests==2.26.0
httpx==0.21.1
pytest==7.1.2
flake8==5.0.4
pytest-timeout==2.1.0
pytest-asyncio==0.19.0
requests==2.28.1
httpx==0.23.0

3
tests/api/routes/compute/test_cloud_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -27,7 +28,7 @@ from gns3server.compute.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture(scope="function")
@pytest_asyncio.fixture(scope="function")
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, on_gns3vm) -> dict:
with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):

4
tests/api/routes/compute/test_docker_nodes.py
View File

@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import sys
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -55,7 +55,7 @@ def base_params() -> dict:
# Docker._instance = None
@pytest.fixture
@pytest_asyncio.fixture
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, base_params: dict) -> dict:
with asyncio_patch("gns3server.compute.docker.Docker.list_images", return_value=[{"image": "nginx"}]):

4
tests/api/routes/compute/test_iou_nodes.py
View File

@ -16,9 +16,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import os
import stat
import sys
import uuid
from fastapi import FastAPI, status
@ -49,7 +49,7 @@ def base_params(tmpdir, fake_iou_bin) -> dict:
return {"application_id": 42, "name": "IOU-TEST-1", "path": "iou.bin"}
@pytest.fixture
@pytest_asyncio.fixture
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, base_params: dict) -> dict:
response = await compute_client.post(app.url_path_for("compute:create_iou_node", project_id=compute_project.id), json=base_params)

3
tests/api/routes/compute/test_nat_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -26,7 +27,7 @@ from gns3server.compute.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture(scope="function")
@pytest_asyncio.fixture(scope="function")
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, ubridge_path: str, on_gns3vm) -> dict:
with asyncio_patch("gns3server.compute.builtin.nodes.nat.Nat._start_ubridge"):

3
tests/api/routes/compute/test_qemu_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import os
import stat
import shutil
@ -69,7 +70,7 @@ def base_params(tmpdir, fake_qemu_bin) -> dict:
return {"name": "QEMU-TEST-1", "qemu_path": fake_qemu_bin}
@pytest.fixture
@pytest_asyncio.fixture
async def qemu_vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, base_params: dict) -> None:
response = await compute_client.post(

3
tests/api/routes/compute/test_virtualbox_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -27,7 +28,7 @@ from gns3server.compute.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture(scope="function")
@pytest_asyncio.fixture(scope="function")
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project) -> None:
vboxmanage_path = "/fake/VboxManage"

3
tests/api/routes/compute/test_vmware_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -27,7 +28,7 @@ from gns3server.compute.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture(scope="function")
@pytest_asyncio.fixture(scope="function")
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vmx_path: str) -> dict:
params = {

3
tests/api/routes/compute/test_vpcs_nodes.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -27,7 +28,7 @@ from gns3server.compute.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture
@pytest_asyncio.fixture
async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project) -> None:
params = {"name": "PC TEST 1"}

3
tests/api/routes/controller/test_groups.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -171,7 +172,7 @@ class TestGroupMembersRoutes:
assert len(members) == 0
@pytest.fixture
@pytest_asyncio.fixture
async def test_role(db_session: AsyncSession) -> Role:
new_role = schemas.RoleCreate(

3
tests/api/routes/controller/test_links.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from typing import Tuple
from fastapi import FastAPI, status
@ -34,7 +35,7 @@ from gns3server.controller.udp_link import UDPLink
pytestmark = pytest.mark.asyncio
@pytest.fixture
@pytest_asyncio.fixture
async def nodes(compute: Compute, project: Project) -> Tuple[Node, Node]:
response = MagicMock()

3
tests/api/routes/controller/test_permissions.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import uuid
from fastapi import FastAPI, status
@ -31,7 +32,7 @@ pytestmark = pytest.mark.asyncio
class TestPermissionRoutes:
@pytest.fixture()
@pytest_asyncio.fixture
async def project(self, app: FastAPI, client: AsyncClient, controller: Controller) -> Project:
project_uuid = str(uuid.uuid4())

3
tests/api/routes/controller/test_projects.py
View File

@ -19,6 +19,7 @@ import uuid
import os
import json
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -32,7 +33,7 @@ from gns3server.controller.project import Project
pytestmark = pytest.mark.asyncio
@pytest.fixture
@pytest_asyncio.fixture
async def project(app: FastAPI, client: AsyncClient, controller: Controller) -> Project:
u = str(uuid.uuid4())

3
tests/api/routes/controller/test_roles.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -105,7 +106,7 @@ class TestRolesRoutes:
assert response.status_code == status.HTTP_403_FORBIDDEN
@pytest.fixture
@pytest_asyncio.fixture
async def test_permission(db_session: AsyncSession) -> Permission:
new_permission = schemas.PermissionCreate(

5
tests/api/routes/controller/test_snapshots.py
View File

@ -18,6 +18,7 @@
import os
import uuid
import pytest
import pytest_asyncio
from fastapi import FastAPI, status
from httpx import AsyncClient
@ -29,7 +30,7 @@ from gns3server.controller.snapshot import Snapshot
pytestmark = pytest.mark.asyncio
@pytest.fixture
@pytest_asyncio.fixture
async def project(app: FastAPI, client: AsyncClient, controller: Controller) -> Project:
u = str(uuid.uuid4())
@ -39,7 +40,7 @@ async def project(app: FastAPI, client: AsyncClient, controller: Controller) ->
return project
@pytest.fixture
@pytest_asyncio.fixture
async def snapshot(project: Project):
snapshot = await project.snapshot("test")

4
tests/api/routes/controller/test_users.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from typing import Optional
from fastapi import FastAPI, HTTPException, status
@ -438,7 +439,8 @@ class TestSuperAdmin:
# assert response.status_code == status.HTTP_200_OK
# assert len(response.json()) == 1
@pytest.fixture
@pytest_asyncio.fixture
async def test_permission(db_session: AsyncSession) -> Permission:
new_permission = schemas.PermissionCreate(

4
tests/compute/builtin/nodes/test_cloud.py
View File

@ -17,6 +17,7 @@
import uuid
import pytest
import pytest_asyncio
from unittest.mock import MagicMock, patch, call
from gns3server.compute.builtin.nodes.cloud import Cloud
@ -30,8 +31,7 @@ def nio():
return NIOUDP(4242, "127.0.0.1", 4343)
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager():
m = MagicMock()

4
tests/compute/docker/test_docker.py
View File

@ -16,6 +16,7 @@
# 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
@ -23,8 +24,7 @@ from gns3server.compute.docker import Docker, DOCKER_PREFERRED_API_VERSION, DOCK
from gns3server.compute.docker.docker_error import DockerError, DockerHttp404Error
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def vm():
vm = Docker()

8
tests/compute/docker/test_docker_vm.py
View File

@ -18,8 +18,8 @@
import aiohttp
import asyncio
import pytest
import pytest_asyncio
import uuid
import sys
import os
from tests.utils import asyncio_patch, AsyncioMagicMock
@ -33,8 +33,7 @@ from gns3server.utils.get_resource import get_resource
from unittest.mock import patch, MagicMock, call
@pytest.fixture()
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = Docker.instance()
@ -42,8 +41,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager):
vm = DockerVM("test", str(uuid.uuid4()), compute_project, manager, "ubuntu:latest", aux_type="none")

5
tests/compute/dynamips/test_dynamips_manager.py
View File

@ -17,8 +17,8 @@
import pytest
import pytest_asyncio
import tempfile
import sys
import uuid
import os
@ -28,8 +28,7 @@ from unittest.mock import patch
from tests.utils import asyncio_patch, AsyncioMagicMock
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = Dynamips.instance()

5
tests/compute/dynamips/test_dynamips_router.py
View File

@ -18,7 +18,7 @@
import os
import uuid
import pytest
import asyncio
import pytest_asyncio
from gns3server.compute.dynamips.nodes.router import Router
from gns3server.compute.dynamips.dynamips_error import DynamipsError
@ -26,8 +26,7 @@ from gns3server.compute.dynamips import Dynamips
from gns3server.config import Config
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = Dynamips.instance()

8
tests/compute/iou/test_iou_vm.py
View File

@ -16,11 +16,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import stat
import socket
import sys
import uuid
import shutil
@ -32,8 +32,7 @@ from gns3server.compute.iou.iou_error import IOUError
from gns3server.compute.iou import IOU
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = IOU.instance()
@ -41,8 +40,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager, config, tmpdir, fake_iou_bin, iourc_file):
vm = IOUVM("test", str(uuid.uuid4()), compute_project, manager, application_id=1)

7
tests/compute/qemu/test_qemu_vm.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import stat
@ -32,8 +33,7 @@ from gns3server.utils import force_unix_path, macaddress_to_int, int_to_macaddre
from gns3server.compute.notification_manager import NotificationManager
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = Qemu.instance()
@ -63,8 +63,7 @@ def fake_qemu_binary(monkeypatch, tmpdir):
return bin_path
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager, fake_qemu_binary, fake_qemu_img_binary):
manager.port_manager.console_host = "127.0.0.1"

5
tests/compute/test_base_node.py
View File

@ -18,7 +18,7 @@
from collections import OrderedDict
import pytest
import asyncio
import pytest_asyncio
from tests.utils import asyncio_patch, AsyncioMagicMock
@ -29,8 +29,7 @@ from gns3server.compute.vpcs import VPCS
from gns3server.compute.nios.nio_udp import NIOUDP
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def manager(port_manager):
m = VPCS.instance()

7
tests/compute/test_manager.py
View File

@ -18,6 +18,7 @@
import uuid
import os
import pytest
import pytest_asyncio
from unittest.mock import patch, MagicMock
from tests.utils import asyncio_patch
@ -28,8 +29,7 @@ from gns3server.compute.error import NodeError, ImageMissingError
from gns3server.utils import force_unix_path
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vpcs(port_manager):
VPCS._instance = None
@ -38,8 +38,7 @@ async def vpcs(port_manager):
return vpcs
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def qemu(port_manager):
Qemu._instance = None

7
tests/compute/test_project.py
View File

@ -19,6 +19,7 @@
import os
import uuid
import pytest
import pytest_asyncio
from uuid import uuid4
from unittest.mock import patch
@ -29,8 +30,7 @@ from gns3server.compute.compute_error import ComputeError, ComputeForbiddenError
from gns3server.compute.vpcs import VPCS, VPCSVM
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def manager(port_manager):
m = VPCS.instance()
@ -38,8 +38,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def node(compute_project, manager):
node = manager.create_node("test", compute_project.id, "00010203-0405-0607-0809-0a0b0c0d0e0f")

3
tests/compute/virtualbox/test_virtualbox_manager.py
View File

@ -17,6 +17,7 @@
import pytest
import pytest_asyncio
import tempfile
import os
import stat
@ -28,7 +29,7 @@ from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
from tests.utils import asyncio_patch
@pytest.fixture
@pytest_asyncio.fixture
async def manager(port_manager):
m = VirtualBox.instance()

7
tests/compute/virtualbox/test_virtualbox_vm.py
View File

@ -17,6 +17,7 @@
import os
import pytest
import pytest_asyncio
from tests.utils import asyncio_patch, AsyncioMagicMock
from gns3server.compute.virtualbox.virtualbox_vm import VirtualBoxVM
@ -24,8 +25,7 @@ from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
from gns3server.compute.virtualbox import VirtualBox
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = VirtualBox.instance()
@ -33,8 +33,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager):
return VirtualBoxVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager, "test", False)

5
tests/compute/vmware/test_vmware_manager.py
View File

@ -16,13 +16,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from gns3server.compute.vmware import VMware
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = VMware.instance()

7
tests/compute/vmware/test_vmware_vm.py
View File

@ -16,13 +16,13 @@
# 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
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = VMware.instance()
@ -30,8 +30,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager, tmpdir):
fake_vmx = str(tmpdir / "test.vmx")

8
tests/compute/vpcs/test_vpcs_vm.py
View File

@ -16,9 +16,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
import asyncio
import os
import sys
from tests.utils import asyncio_patch, AsyncioMagicMock
from gns3server.utils import parse_version
@ -30,8 +30,7 @@ from gns3server.compute.vpcs import VPCS
from gns3server.compute.notification_manager import NotificationManager
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def manager(port_manager):
m = VPCS.instance()
@ -39,8 +38,7 @@ async def manager(port_manager):
return m
@pytest.fixture(scope="function")
@pytest.mark.asyncio
@pytest_asyncio.fixture(scope="function")
async def vm(compute_project, manager, tmpdir, ubridge_path):
vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)

20
tests/conftest.py
View File

@ -1,5 +1,6 @@
import pytest
import asyncio
import pytest_asyncio
import tempfile
import shutil
import sys
@ -43,14 +44,14 @@ def event_loop(request):
loop.close()
@pytest.fixture(scope="class")
@pytest_asyncio.fixture(scope="class")
async def app() -> FastAPI:
from gns3server.api.server import app as gns3app
yield gns3app
@pytest.fixture(scope="class")
@pytest_asyncio.fixture(scope="class")
async def db_engine():
db_url = os.getenv("GNS3_TEST_DATABASE_URI", "sqlite+aiosqlite:///:memory:") # "sqlite:///./sql_test_app.db"
@ -59,7 +60,7 @@ async def db_engine():
#await engine.sync_engine.dispose()
@pytest.fixture(scope="class")
@pytest_asyncio.fixture(scope="class")
async def db_session(db_engine):
# recreate database tables for each class
@ -80,7 +81,7 @@ async def db_session(db_engine):
await session.close()
@pytest.fixture
@pytest_asyncio.fixture
async def base_client(app: FastAPI, db_session: AsyncSession) -> AsyncClient:
async def _get_test_db():
@ -99,7 +100,7 @@ async def base_client(app: FastAPI, db_session: AsyncSession) -> AsyncClient:
yield async_client
@pytest.fixture
@pytest_asyncio.fixture
async def test_user(db_session: AsyncSession) -> User:
new_user = schemas.UserCreate(
@ -119,7 +120,7 @@ async def test_user(db_session: AsyncSession) -> User:
return user
@pytest.fixture
@pytest_asyncio.fixture
async def test_compute(db_session: AsyncSession) -> Compute:
new_compute = schemas.ComputeCreate(
@ -154,7 +155,7 @@ def authorized_client(base_client: AsyncClient, test_user: User) -> AsyncClient:
return base_client
@pytest.fixture
@pytest_asyncio.fixture
async def client(base_client: AsyncClient) -> AsyncClient:
# The super admin is automatically created when the users table is created
@ -167,7 +168,7 @@ async def client(base_client: AsyncClient) -> AsyncClient:
return base_client
@pytest.fixture
@pytest_asyncio.fixture
async def compute_client(base_client: AsyncClient) -> AsyncClient:
# default compute username is 'admin'
@ -206,8 +207,7 @@ def compute(controller):
return compute
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def project(tmpdir, controller):
return await controller.add_project(name="Test")

4
tests/controller/gns3vm/test_virtualbox_gns3_vm.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from tests.utils import asyncio_patch
from gns3server.utils.asyncio import wait_run_in_executor
@ -23,8 +24,7 @@ from gns3server.utils.asyncio import wait_run_in_executor
from gns3server.controller.gns3vm.virtualbox_gns3_vm import VirtualBoxGNS3VM
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def gns3vm(controller):
vm = VirtualBoxGNS3VM(controller)

4
tests/controller/gns3vm/test_vmware_gns3_vm.py
View File

@ -16,12 +16,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from gns3server.controller.gns3vm.vmware_gns3_vm import VMwareGNS3VM
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def gns3vm(controller):
vm = VMwareGNS3VM(controller)

7
tests/controller/test_export_project.py
View File

@ -19,6 +19,7 @@
import os
import json
import pytest
import pytest_asyncio
import zipfile
from pathlib import Path
@ -32,8 +33,7 @@ from gns3server.utils.asyncio import aiozipstream
from gns3server.controller.controller_error import ControllerError
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def project(controller):
p = Project(controller=controller, name="test")
@ -41,8 +41,7 @@ async def project(controller):
return p
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def node(controller, project):
compute = MagicMock()

4
tests/controller/test_link.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from unittest.mock import MagicMock
from gns3server.controller.link import Link
@ -26,8 +27,7 @@ from gns3server.controller.controller_error import ControllerError
from tests.utils import AsyncioBytesIO, AsyncioMagicMock
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def link(project, compute):
node1 = Node(project, compute, "node1", node_type="qemu")

1
tests/controller/test_node_port_name.py
View File

@ -30,6 +30,7 @@ def compute():
s.id = "http://test.com:42"
return s
@pytest.fixture
def node(compute, project):
node = Node(project, compute, "demo",

4
tests/controller/test_notification.py
View File

@ -16,13 +16,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest
import pytest_asyncio
from unittest.mock import MagicMock
from tests.utils import AsyncioMagicMock
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def node(project):
compute = MagicMock()

5
tests/controller/test_project.py
View File

@ -17,9 +17,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import sys
import uuid
import pytest
import pytest_asyncio
from unittest.mock import MagicMock
from tests.utils import AsyncioMagicMock, asyncio_patch
from unittest.mock import patch
@ -32,8 +32,7 @@ from gns3server.controller.controller_error import ControllerError, ControllerNo
from gns3server.config import Config
@pytest.fixture
@pytest.mark.asyncio
@pytest_asyncio.fixture
async def node(controller, project):
compute = MagicMock()