xfs: Don't uninstall xfs tools when SR couldn't be destroyed

Leave xfs tools in place for manual cleanup after a failed SR cleanup

Signed-off-by: Antoine Bartuccio <[email protected]>

Author: klmp200

tests/storage/xfs/conftest.py

@@ -3,41 +3,60 @@
 import pytest
 
 import logging
+from dataclasses import dataclass
 
 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
+
+@dataclass
+class XfsConfig:
+    uninstall_xfs: bool = True
+
+@pytest.fixture(scope='package')
+def _xfs_config() -> XfsConfig:
+    return XfsConfig()
 
 @pytest.fixture(scope='package')
-def host_with_xfsprogs(host):
+def host_with_xfsprogs(host: Host, _xfs_config: XfsConfig) -> Generator[Host]:
     assert not host.file_exists('/usr/sbin/mkfs.xfs'), \
         "xfsprogs must not be installed on the host at the beginning of the tests"
     host.yum_save_state()
     host.yum_install(['xfsprogs'])
     yield host
     # teardown
-    host.yum_restore_saved_state()
+    if _xfs_config.uninstall_xfs:
+        host.yum_restore_saved_state()
 
 @pytest.fixture(scope='package')
-def xfs_sr(unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]], host_with_xfsprogs: Host
-           ) -> Generator[SR]:
+def xfs_sr(
+    unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
+    host_with_xfsprogs: Host,
+    _xfs_config: XfsConfig,
+) -> Generator[SR]:
     """ A XFS SR on first host. """
     sr_disk = unused_512B_disks[host_with_xfsprogs][0]["name"]
     sr = host_with_xfsprogs.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk})
     yield sr
     # teardown
-    sr.destroy()
+    try:
+        sr.destroy()
+    except Exception as e:
+        _xfs_config.uninstall_xfs = False
+        raise pytest.fail("Could not destroy xfs SR, leaving packages in place for manual cleanup") from e
 
 @pytest.fixture(scope='module')
-def vdi_on_xfs_sr(xfs_sr):
+def vdi_on_xfs_sr(xfs_sr: SR) -> Generator[VDI]:
     vdi = xfs_sr.create_vdi('XFS-local-VDI-test')
     yield vdi
     vdi.destroy()
 
 @pytest.fixture(scope='module')
-def vm_on_xfs_sr(host, xfs_sr, vm_ref):
+def vm_on_xfs_sr(host: Host, xfs_sr: SR, vm_ref: str) -> Generator[VM]:
     vm = host.import_vm(vm_ref, sr_uuid=xfs_sr.uuid)
     yield vm
     # teardown