Use unused_disks in xfs tests

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

Author: ydirson

tests/storage/xfs/conftest.py

@@ -12,8 +12,9 @@ def host_with_xfsprogs(host):
     host.yum_restore_saved_state()
 
 @pytest.fixture(scope='package')
-def xfs_sr(sr_disk, host_with_xfsprogs):
+def xfs_sr(unused_disks, host_with_xfsprogs):
     """ A XFS SR on first host. """
+    sr_disk = unused_disks[host_with_xfsprogs][0]
     sr = host_with_xfsprogs.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk})
     yield sr
     # teardown

tests/storage/xfs/test_xfs_sr.py

@@ -17,10 +17,11 @@ class TestXFSSRCreateDestroy:
     and VM import.
     """
 
-    def test_create_xfs_sr_without_xfsprogs(self, host, sr_disk):
+    def test_create_xfs_sr_without_xfsprogs(self, host, unused_disks):
         # This test must be the first in the series in this module
         assert not host.file_exists('/usr/sbin/mkfs.xfs'), \
             "xfsprogs must not be installed on the host at the beginning of the tests"
+        sr_disk = unused_disks[host][0]
         sr = None
         try:
             sr = host.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk})
@@ -30,9 +31,10 @@ def test_create_xfs_sr_without_xfsprogs(self, host, sr_disk):
             sr.destroy()
             assert False, "SR creation should not have succeeded!"
 
-    def test_create_and_destroy_sr(self, sr_disk, host_with_xfsprogs):
+    def test_create_and_destroy_sr(self, unused_disks, host_with_xfsprogs):
         # Create and destroy tested in the same test to leave the host as unchanged as possible
         host = host_with_xfsprogs
+        sr_disk = unused_disks[host][0]
         sr = host.sr_create('xfs', "XFS-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