tests/xapi_plugins/plugin_zfs: add type hints

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

Author: glehmann

tests/xapi_plugins/plugin_zfs/conftest.py

@@ -1,23 +1,27 @@
 import pytest
 
-# Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
 from lib.host import Host
+
+# Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
 from pkgfixtures import host_with_saved_yum_state, sr_disk_wiped
 
+from typing import Generator
+
 @pytest.fixture(scope='package')
-def host_without_zfs(host):
+def host_without_zfs(host: Host) -> Generator[None, None, None]:
     assert not host.file_exists('/usr/sbin/zpool'), \
         "zfs must not be installed on the host at the beginning of the tests"
+    yield
 
 @pytest.fixture(scope='package')
-def host_with_zfs(host_without_zfs: Host, host_with_saved_yum_state: Host):
+def host_with_zfs(host_without_zfs: Host, host_with_saved_yum_state: Host) -> Generator[Host, None, None]:
     host = host_with_saved_yum_state
     host.yum_install(['zfs'])
     host.ssh('modprobe zfs')
     yield host
 
 @pytest.fixture(scope='package')
-def zpool_vol0(sr_disk_wiped, host_with_zfs: Host):
+def zpool_vol0(sr_disk_wiped: str, host_with_zfs: Host) -> Generator[None, None, None]:
     host_with_zfs.ssh(f'zpool create -f vol0 /dev/{sr_disk_wiped}')
     yield
     # teardown

tests/xapi_plugins/plugin_zfs/test_zfs.py

@@ -3,14 +3,16 @@
 import json
 import logging
 
+from lib.host import Host
+
 # Requirements:
 # From --hosts parameter:
 # - host(A1): first XCP-ng host > 8.2 with an additional unused disk for the SR.
 # And:
 # - access to XCP-ng RPM repository from hostA1
 
 @pytest.mark.usefixtures("zpool_vol0")
-def test_list_zfs_pools(host):
+def test_list_zfs_pools(host: Host) -> None:
     logging.info("List ZFS pools on host")
     res = host.call_plugin('zfs.py', 'list_zfs_pools')
     assert json.loads(res).get("vol0") is not None