Merge pull request #345 from xcp-ng/mlr/933-restart-toolstack-after-teardown

Add toolstack restart after teardown on tests enabling / disabling SRs

Author: stormi

pkgfixtures.py

@@ -38,11 +38,36 @@ def formatted_and_mounted_ext4_disk(host: Host, unused_512B_disks: dict[Host, li
     yield mountpoint
     teardown_formatted_and_mounted_disk(host, mountpoint)
 
-@pytest.fixture(scope='package')
-def host_with_saved_yum_state(host: Host) -> Generator[Host]:
+def _host_with_saved_yum_state(host: Host, restart_toolstack: bool) -> Generator[Host]:
+    """
+    Saves the yum state and restores the saved state on teardown.
+
+    It also optionally restarts the toolstack.
+    Fixtures using this function should not be used concurrently in the same test run.
+    """
     host.yum_save_state()
     yield host
     host.yum_restore_saved_state()
+    if restart_toolstack:
+        host.restart_toolstack(verify=True)
+
+@pytest.fixture(scope='package')
+def host_with_saved_yum_state(host: Host) -> Generator[Host]:
+    """
+    Saves the yum state and then restore it on teardown.
+
+    Should not be used concurrently with another "host_with_saved_yum_state" fixture
+    """
+    yield from _host_with_saved_yum_state(host, False)
+
+@pytest.fixture(scope='package')
+def host_with_saved_yum_state_toolstack_restart(host: Host) -> Generator[Host]:
+    """
+    Saves the yum state then restore it and restarts the toolstack on teardown.
+
+    Should not be used concurrently with another "host_with_saved_yum_state" fixture
+    """
+    yield from _host_with_saved_yum_state(host, True)
 
 @pytest.fixture(scope='package')
 def pool_with_saved_yum_state(host: Host) -> Generator[Pool]:

tests/storage/fsp/conftest.py

@@ -1,7 +1,7 @@
 import pytest
 
 # Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
-from pkgfixtures import host_with_saved_yum_state
+from pkgfixtures import host_with_saved_yum_state_toolstack_restart
 
 FSP_REPO_NAME = 'runx'
 
@@ -10,8 +10,8 @@
 DIRECTORIES_PATH = 'directories'
 
 @pytest.fixture(scope='package')
-def host_with_runx_repo(host_with_saved_yum_state):
-    host = host_with_saved_yum_state
+def host_with_runx_repo(host_with_saved_yum_state_toolstack_restart):
+    host = host_with_saved_yum_state_toolstack_restart
     host.add_xcpng_repo(FSP_REPO_NAME, 'vates')
     yield host
     # teardown

tests/storage/linstor/conftest.py

@@ -110,6 +110,7 @@ def install_linstor(host):
     def remove_linstor(host):
         logging.info(f"Cleaning up python-linstor from host {host}...")
         host.yum_remove(["python-linstor"])
+        host.restart_toolstack(verify=True)
 
     with concurrent.futures.ThreadPoolExecutor() as executor:
         executor.map(remove_linstor, pool.hosts)

tests/storage/zfsvol/conftest.py

@@ -3,11 +3,11 @@
 import logging
 
 # Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
-from pkgfixtures import host_with_saved_yum_state, sr_disk_wiped
+from pkgfixtures import host_with_saved_yum_state_toolstack_restart, sr_disk_wiped
 
 @pytest.fixture(scope='package')
-def host_with_zfsvol(host_with_saved_yum_state):
-    host = host_with_saved_yum_state
+def host_with_zfsvol(host_with_saved_yum_state_toolstack_restart):
+    host = host_with_saved_yum_state_toolstack_restart
     host.yum_install(['xcp-ng-xapi-storage-volume-zfsvol'])
     host.restart_toolstack(verify=True)
     yield host