Ryan Harper has proposed merging
~raharper/curtin:fix/vmtest-basic-scsi-pnum-disk into curtin:master.
Commit message:
vmtest: basic use dname to lookup disk with multiple partitions
This handles unstable scsi device names (sdc/sdd) which shuffle around
from time to time; instead look up the assigned name via the dname
value. This should fix vmtest failures on BasicScsi on ppc64le/arm64.
Requested reviews:
curtin developers (curtin-dev)
For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/382607
--
Your team curtin developers is requested to review the proposed merge of
~raharper/curtin:fix/vmtest-basic-scsi-pnum-disk into curtin:master.
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index ca4259a..bb6d3a4 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -131,8 +131,8 @@ class TestBasicAbs(VMBaseClass):
self._test_ptable("blkid_output_diska", expected_ptable)
def test_partition_numbers(self):
- # disk-d should have partitions 1 2, and 10
- disk = self._serial_to_kname('disk-d')
+ # pnum_disk should have partitions 1 2, and 10
+ disk = self._dname_to_kname('pnum_disk')
expected = [disk + s for s in ["", "1", "2", "10"]]
self._test_partition_numbers(disk, expected)
@@ -290,8 +290,8 @@ class TestBasicScsiAbs(TestBasicAbs):
self._test_ptable("blkid_output_sda", expected_ptable)
def test_partition_numbers(self):
- # sdd should have partitions 1, 2, and 10
- disk = "sdd"
+ # pnum_disk should have partitions 1, 2, and 10
+ disk = self._dname_to_kname('pnum_disk')
expected = [disk + s for s in ["", "1", "2", "10"]]
self._test_partition_numbers(disk, expected)
--
Mailing list: https://launchpad.net/~curtin-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~curtin-dev
More help : https://help.launchpad.net/ListHelp
