style: sort imports in compute and controller tests

tests/controller/gns3vm/test_remote_gns3_vm.py

@@ -16,11 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-
-from gns3server.controller.gns3vm.remote_gns3_vm import RemoteGNS3VM
-from gns3server.controller.gns3vm.gns3_vm_error import GNS3VMError
 from pydantic import SecretStr
 
+from gns3server.controller.gns3vm.gns3_vm_error import GNS3VMError
+from gns3server.controller.gns3vm.remote_gns3_vm import RemoteGNS3VM
+
 
 @pytest.fixture
 def gns3vm(controller):

tests/controller/gns3vm/test_virtualbox_gns3_vm.py

@@ -18,10 +18,9 @@
 import pytest
 import pytest_asyncio
 
-from tests.utils import asyncio_patch
-from gns3server.utils.asyncio import wait_run_in_executor
-
 from gns3server.controller.gns3vm.virtualbox_gns3_vm import VirtualBoxGNS3VM
+from gns3server.utils.asyncio import wait_run_in_executor
+from tests.utils import asyncio_patch
 
 
 @pytest_asyncio.fixture

tests/controller/test_appliance.py

@@ -22,7 +22,6 @@ from gns3server.controller.appliance import Appliance
 from gns3server.controller.appliance_to_template import ApplianceToTemplate
 from gns3server.schemas.controller.appliances import ApplianceModel
 
-
 # v8 mirror of the XRd Control Plane appliance shape (docker, custom_adapters, no versions)
 XRD_V8 = {
     "registry_version": 8,

tests/controller/test_appliance_manager.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import uuid
+
 import pytest
 
 from gns3server.controller.appliance import Appliance

tests/controller/test_appliance_to_template.py

@@ -15,14 +15,13 @@
 # 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
 import pydantic
+import pytest
 
 from gns3server.controller.appliance_to_template import ApplianceToTemplate
 from gns3server.controller.controller_error import ControllerError
 from gns3server.schemas.controller.appliances import ApplianceModel
 
-
 # reduced mirror of the upstream vyos.gns3a (registry version 8, qemu, 2 settings sets)
 VYOS_V8 = {
     "registry_version": 8,

tests/controller/test_compute.py

@@ -15,25 +15,26 @@
 # 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 sys
-import json
 import asyncio
+import json
+import sys
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
 import aiohttp
 import pytest
-from types import SimpleNamespace
-from unittest.mock import patch, MagicMock
+from pydantic import SecretStr
 
-from gns3server.controller.project import Project
-from gns3server.controller.compute import Compute
 from gns3server.api.server import app as gns3_app
+from gns3server.controller.compute import Compute
 from gns3server.controller.controller_error import (
+    ComputeConflictError,
     ControllerError,
     ControllerNotFoundError,
     ControllerUnauthorizedError,
-    ComputeConflictError,
 )
-from pydantic import SecretStr
-from tests.utils import asyncio_patch, AsyncioMagicMock
+from gns3server.controller.project import Project
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 
 @pytest.fixture

tests/controller/test_controller.py

@@ -15,21 +15,21 @@
 # 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 os
-import uuid
-import json
 import asyncio
-import pytest
+import json
+import os
 import socket
+import uuid
 from unittest.mock import MagicMock, patch
-from tests.utils import AsyncioMagicMock, asyncio_patch
-from watchdog.events import FileCreatedEvent, DirCreatedEvent
 
+import pytest
+from watchdog.events import DirCreatedEvent, FileCreatedEvent
+
+from gns3server.controller import _ProjectsDirectoryEventHandler
 from gns3server.controller.compute import Compute
 from gns3server.controller.controller_error import ControllerError, ControllerNotFoundError
-from gns3server.controller import _ProjectsDirectoryEventHandler
 from gns3server.version import __version__
-
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 # def test_save(controller, controller_config_path):
 #

tests/controller/test_drawing.py

@@ -15,14 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from unittest.mock import MagicMock
-import pytest
-import uuid
 import os
+import uuid
+from unittest.mock import MagicMock
 
-from tests.utils import AsyncioMagicMock
+import pytest
 
 from gns3server.controller.drawing import Drawing
+from tests.utils import AsyncioMagicMock
 
 
 @pytest.fixture

tests/controller/test_export_project.py

@@ -16,22 +16,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import os
 import json
+import os
+import stat
+import zipfile
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
 import pytest
 import pytest_asyncio
-import zipfile
-import stat
 
-from pathlib import Path
-from unittest.mock import patch
-from unittest.mock import MagicMock
-from tests.utils import AsyncioMagicMock, AsyncioBytesIO
-
-from gns3server.controller.project import Project
-from gns3server.controller.export_project import export_project, _is_exportable
-from gns3server.utils.asyncio import aiozipstream
 from gns3server.controller.controller_error import ControllerError
+from gns3server.controller.export_project import _is_exportable, export_project
+from gns3server.controller.project import Project
+from gns3server.utils.asyncio import aiozipstream
+from tests.utils import AsyncioBytesIO, AsyncioMagicMock
 
 
 @pytest_asyncio.fixture

tests/controller/test_gns3vm.py

@@ -15,13 +15,14 @@
 # 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
 import sys
-from tests.utils import asyncio_patch, AsyncioMagicMock
+
+import pytest
+from pydantic import SecretStr
 
 from gns3server.controller.gns3vm import GNS3VM
 from gns3server.controller.gns3vm.gns3_vm_error import GNS3VMError
-from pydantic import SecretStr
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 
 @pytest.fixture

tests/controller/test_import_project.py

@@ -15,23 +15,22 @@
 # 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
+import json
 import os
 import uuid
-import json
 import zipfile
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
 import pytest
 
-from pathlib import Path
-from tests.utils import asyncio_patch, AsyncioMagicMock
-from unittest.mock import patch, MagicMock
-
-from gns3server.utils.asyncio import aiozipstream
-from gns3server.controller.project import Project
 from gns3server.controller.controller_error import ControllerError
 from gns3server.controller.export_project import export_project
-from gns3server.controller.import_project import import_project, _move_files_to_compute
+from gns3server.controller.import_project import _move_files_to_compute, import_project
+from gns3server.controller.project import Project
+from gns3server.utils.asyncio import aiozipstream
 from gns3server.version import __version__
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 
 @pytest.mark.asyncio

tests/controller/test_link.py

@@ -15,15 +15,16 @@
 # 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
-import pytest_asyncio
 from unittest.mock import MagicMock
 
+import pytest
+import pytest_asyncio
+
+from gns3server.controller.controller_error import ControllerError
 from gns3server.controller.link import Link
 from gns3server.controller.node import Node
 from gns3server.controller.ports.ethernet_port import EthernetPort
 from gns3server.controller.ports.serial_port import SerialPort
-from gns3server.controller.controller_error import ControllerError
 from tests.utils import AsyncioBytesIO, AsyncioMagicMock
 
 

tests/controller/test_marker.py

@@ -25,18 +25,17 @@ Controller-layer tests for the traffic-insight marker feature:
 """
 
 import uuid
+from contextlib import ExitStack
+from unittest.mock import MagicMock, patch
 
 import pytest
-from unittest.mock import MagicMock, patch
-from contextlib import ExitStack
 
-from tests.utils import AsyncioMagicMock
-
-from gns3server.controller.udp_link import UDPLink
+from gns3server.controller.controller_error import ControllerError, ControllerNotFoundError
+from gns3server.controller.node import Node
 from gns3server.controller.ports.ethernet_port import EthernetPort
 from gns3server.controller.ports.serial_port import SerialPort
-from gns3server.controller.node import Node
-from gns3server.controller.controller_error import ControllerError, ControllerNotFoundError
+from gns3server.controller.udp_link import UDPLink
+from tests.utils import AsyncioMagicMock
 
 
 def _valid_bpf():

tests/controller/test_marker_replay.py

@@ -43,25 +43,25 @@ from unittest.mock import patch
 
 import pytest
 
+from gns3server.controller import marker_replay
 from gns3server.controller.controller_error import (
     ControllerBadRequestError,
     ControllerError,
     ControllerNotFoundError,
 )
-from gns3server.controller import marker_replay
 from gns3server.controller.marker_replay import (
     FilterError,
     SharkdError,
     SharkdMissingError,
+    _count_tree_nodes,
+    _format_ts,
+    _parse_ts,
+    _rename_value,
     build_timeline,
     decode_frame,
     query_frames,
     read_frame_bytes,
     scan_pcap_frames,
-    _count_tree_nodes,
-    _format_ts,
-    _parse_ts,
-    _rename_value,
 )
 
 pytestmark = pytest.mark.asyncio

tests/controller/test_node.py

@@ -15,18 +15,18 @@
 # 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 shutil
-import pytest
-import uuid
 import os
+import shutil
+import uuid
+from unittest.mock import ANY, MagicMock
+
+import pytest
 
-from unittest.mock import MagicMock, ANY
-from tests.utils import AsyncioMagicMock, asyncio_patch
 from gns3server.compute.docker.docker_error import DockerError
-
+from gns3server.controller.controller_error import ComputeConflictError, ControllerError
 from gns3server.controller.node import Node
 from gns3server.controller.project import Project
-from gns3server.controller.controller_error import ComputeConflictError, ControllerError
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 
 @pytest.fixture

tests/controller/test_node_port_name.py

@@ -15,13 +15,13 @@
 # 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
 import uuid
 
-from tests.utils import AsyncioMagicMock
+import pytest
 
 from gns3server.controller.node import Node
 from gns3server.controller.ports.ethernet_port import EthernetPort
+from tests.utils import AsyncioMagicMock
 
 
 @pytest.fixture

tests/controller/test_notification.py

@@ -15,9 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from unittest.mock import MagicMock
+
 import pytest
 import pytest_asyncio
-from unittest.mock import MagicMock
 
 from tests.utils import AsyncioMagicMock
 

tests/controller/test_project.py

@@ -15,26 +15,26 @@
 # 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 os
 import json
+import os
 import uuid
-import pytest
-import pytest_asyncio
-from unittest.mock import MagicMock
-from tests.utils import AsyncioMagicMock, asyncio_patch
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
-from gns3server.controller.project import Project
+import pytest
+import pytest_asyncio
+
+from gns3server.config import Config
+from gns3server.controller.controller_error import (
+    ComputeConflictError,
+    ControllerError,
+    ControllerForbiddenError,
+    ControllerNotFoundError,
+)
 from gns3server.controller.node import Node
 from gns3server.controller.ports.ethernet_port import EthernetPort
-from gns3server.controller.controller_error import (
-    ControllerError,
-    ControllerNotFoundError,
-    ControllerForbiddenError,
-    ComputeConflictError,
-)
-from gns3server.config import Config
+from gns3server.controller.project import Project
+from tests.utils import AsyncioMagicMock, asyncio_patch
 
 
 @pytest_asyncio.fixture

tests/controller/test_project_open.py

@@ -15,14 +15,14 @@
 # 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 os
 import json
-import pytest
+import os
 
-from tests.utils import asyncio_patch
+import pytest
 
 from gns3server.controller.compute import Compute
 from gns3server.controller.project import Project
+from tests.utils import asyncio_patch
 
 
 @pytest.fixture

tests/controller/test_rbac.py

@@ -15,22 +15,22 @@
 # 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
-import pytest_asyncio
 import uuid
 
+import pytest
+import pytest_asyncio
 from fastapi import FastAPI, status
 from httpx import AsyncClient
 from httpx_ws.transport import ASGIWebSocketTransport
-
 from sqlalchemy.ext.asyncio import AsyncSession
+
 from gns3server.controller import Controller
+from gns3server.db.models import User
+from gns3server.db.repositories.pools import ResourcePoolsRepository
 from gns3server.db.repositories.rbac import RbacRepository
 from gns3server.db.repositories.users import UsersRepository
-from gns3server.db.repositories.pools import ResourcePoolsRepository
-from gns3server.schemas.controller.rbac import ACECreate
 from gns3server.schemas.controller.pools import ResourceCreate, ResourcePoolCreate
-from gns3server.db.models import User
+from gns3server.schemas.controller.rbac import ACECreate
 from gns3server.services import auth_service
 
 pytestmark = pytest.mark.asyncio

tests/controller/test_snapshot.py

@@ -16,13 +16,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+from unittest import mock
+from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from unittest import mock
-from unittest.mock import patch, MagicMock
-from gns3server.controller.snapshot import Snapshot
 
+from gns3server.controller.snapshot import Snapshot
 from tests.utils import AsyncioMagicMock
 
 

tests/controller/test_symbols.py

@@ -17,8 +17,8 @@
 
 import os
 
-from gns3server.controller.symbols import Symbols
 from gns3server.controller.symbol_themes import BUILTIN_SYMBOL_THEMES
+from gns3server.controller.symbols import Symbols
 from gns3server.utils.get_resource import get_resource
 
 

tests/controller/test_topology.py

@@ -17,15 +17,16 @@
 
 import json
 import uuid
-import pytest
 from unittest.mock import MagicMock, patch
-from tests.utils import asyncio_patch
 
-from gns3server.controller.project import Project
+import pytest
+
 from gns3server.controller.compute import Compute
-from gns3server.controller.topology import project_to_topology, load_topology, GNS3_FILE_FORMAT_REVISION
 from gns3server.controller.controller_error import ControllerError
+from gns3server.controller.project import Project
+from gns3server.controller.topology import GNS3_FILE_FORMAT_REVISION, load_topology, project_to_topology
 from gns3server.version import __version__
+from tests.utils import asyncio_patch
 
 
 @pytest.mark.asyncio

tests/controller/test_udp_link.py

@@ -15,14 +15,15 @@
 # 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
 from unittest.mock import MagicMock
-from tests.utils import AsyncioMagicMock
 
-from gns3server.controller.udp_link import UDPLink
-from gns3server.controller.ports.ethernet_port import EthernetPort
-from gns3server.controller.node import Node
+import pytest
+
 from gns3server.controller.controller_error import ControllerError
+from gns3server.controller.node import Node
+from gns3server.controller.ports.ethernet_port import EthernetPort
+from gns3server.controller.udp_link import UDPLink
+from tests.utils import AsyncioMagicMock
 
 
 @pytest.mark.asyncio