Use unused_disks in ext tests

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

pkgfixtures.py

@@ -19,8 +19,9 @@
 
 # package scope because previous test packages may have used the disk
 @pytest.fixture(scope='package')
-def sr_disk_wiped(host: Host, sr_disk: DiskDevName) -> Generator[DiskDevName]:
+def sr_disk_wiped(host: Host, unused_disks: dict[Host, list[DiskDevName]]) -> Generator[DiskDevName]:
     """A disk on MASTER HOST OF FIRST POOL which we wipe."""
+    sr_disk = unused_disks[host][0]
     logging.info(">> wipe disk %s" % sr_disk)
     host.ssh(['wipefs', '-a', '/dev/' + sr_disk])
     yield sr_disk

tests/storage/ext/conftest.py

@@ -2,8 +2,9 @@
 import pytest
 
 @pytest.fixture(scope='package')
-def ext_sr(host, sr_disk):
+def ext_sr(host, unused_disks):
     """ An EXT SR on first host. """
+    sr_disk = unused_disks[host][0]
     sr = host.sr_create('ext', "EXT-local-SR-test", {'device': '/dev/' + sr_disk})
     yield sr
     # teardown

tests/storage/ext/test_ext_sr.py

@@ -15,8 +15,9 @@ class TestEXTSRCreateDestroy:
     def test_create_sr_with_missing_device(self, host):
         try_to_create_sr_with_missing_device('ext', 'EXT-local-SR-test', host)
 
-    def test_create_and_destroy_sr(self, host, sr_disk):
+    def test_create_and_destroy_sr(self, host, unused_disks):
         # Create and destroy tested in the same test to leave the host as unchanged as possible
+        sr_disk = unused_disks[host][0]
         sr = host.sr_create('ext', "EXT-local-SR-test", {'device': '/dev/' + sr_disk}, verify=True)
         # import a VM in order to detect vm import issues here rather than in the vm_on_xfs_fixture used in
         # the next tests, because errors in fixtures break teardown