refactor: don't use TYPE_CHECKING in tests/

It doesn't play well with the automatic import of a class in the IDE
and is not needed in tests/, unlike in lib/

Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>

Author: glehmann

tests/install/conftest.py

@@ -6,19 +6,16 @@
 import logging
 import os
 import tempfile
-import xml.etree.ElementTree as ET
 
 from data import ARP_SERVER, ISO_IMAGES, ISO_IMAGES_BASE, ISO_IMAGES_CACHE, TEST_SSH_PUBKEY, TOOLS
 from lib import installer, pxe
 from lib.commands import local_cmd
 from lib.common import callable_marker, url_download, wait_for
+from lib.host import Host
 from lib.installer import AnswerFile
+from lib.vm import VM
 
-from typing import TYPE_CHECKING, Any, Generator, Sequence
-
-if TYPE_CHECKING:
-    from lib.host import Host
-    from lib.vm import VM
+from typing import Generator, Sequence
 
 # Return true if the version of the ISO doesn't support the source type.
 # Note: this is a quick-win hack, to avoid explicit enumeration of supported

tests/storage/glusterfs/conftest.py

@@ -7,16 +7,12 @@
 
 from lib import config
 from lib.common import exec_nofail, raise_errors, setup_formatted_and_mounted_disk, teardown_formatted_and_mounted_disk
+from lib.host import Host
 from lib.netutil import is_ipv6
-
-from typing import TYPE_CHECKING, Generator
-
-if TYPE_CHECKING:
-    from lib.host import Host
-    from lib.pool import Pool
-    from lib.sr import SR
-    from lib.vdi import VDI
-    from lib.vm import VM
+from lib.pool import Pool
+from lib.sr import SR
+from lib.vdi import VDI
+from lib.vm import VM
 
 # explicit import for package-scope fixtures
 from pkgfixtures import (
@@ -29,6 +25,8 @@
     xfs_sr_on_hostB1,
 )
 
+from typing import Generator
+
 GLUSTERFS_PORTS = [('24007', 'tcp'), ('49152:49251', 'tcp')]
 
 @dataclass

tests/storage/largeblock/conftest.py

@@ -5,15 +5,12 @@
 import logging
 
 from lib import config
-from lib.vdi import ImageFormat
+from lib.host import Host
+from lib.sr import SR
+from lib.vdi import VDI, ImageFormat
+from lib.vm import VM
 
-from typing import TYPE_CHECKING, Generator
-
-if TYPE_CHECKING:
-    from lib.host import Host
-    from lib.sr import SR
-    from lib.vdi import VDI
-    from lib.vm import VM
+from typing import Generator
 
 @pytest.fixture(scope='package')
 def largeblock_sr(host: Host,

tests/storage/largeblock/create_destroy/test_create_destroy_largeblock_sr.py

@@ -3,14 +3,10 @@
 import pytest
 
 from lib.common import vm_image
+from lib.host import Host
 from lib.vdi import ImageFormat
 from tests.storage import try_to_create_sr_with_missing_device
 
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lib.host import Host
-
 # Requirements:
 # - one XCP-ng host with an additional unused 4KiB disk for the SR
 

tests/storage/largeblock/test_largeblock_sr.py

@@ -3,17 +3,12 @@
 import pytest
 
 from lib.common import vm_image, wait_for
-from lib.vdi import ImageFormat
+from lib.host import Host
+from lib.sr import SR
+from lib.vdi import VDI, ImageFormat
+from lib.vm import VM
 from tests.storage import try_to_create_sr_with_missing_device, vdi_is_open
 
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lib.host import Host
-    from lib.sr import SR
-    from lib.vdi import VDI
-    from lib.vm import VM
-
 # Requirements:
 # - one XCP-ng host with an additional unused 4KiB disk for the SR
 

tests/storage/linstor/conftest.py

@@ -11,7 +11,11 @@
 
 import lib.commands as commands
 from lib import config
-from lib.common import safe_split
+from lib.host import Host
+from lib.pool import Pool
+from lib.sr import SR
+from lib.vdi import VDI
+from lib.vm import VM
 
 try:
     from data import LINSTOR_REDUNDANCY  # type: ignore
@@ -29,14 +33,7 @@
     xfs_sr_on_hostB1,
 )
 
-from typing import TYPE_CHECKING, Generator
-
-if TYPE_CHECKING:
-    from lib.host import Host
-    from lib.pool import Pool
-    from lib.sr import SR
-    from lib.vdi import VDI
-    from lib.vm import VM
+from typing import Generator
 
 GROUP_NAME = 'linstor_group'
 STORAGE_POOL_NAME = f'{GROUP_NAME}/thin_device'