Ryan Harper has proposed merging ~raharper/curtin:fix/vmtest-centos-basic into
curtin:master.
Commit message:
vmtest: centos66 doesn't use dname
Handle centos66 unittest results differently due to dname
not working there.
LP: #1874100
Requested reviews:
curtin developers (curtin-dev)
Related bugs:
Bug #1874100 in curtin: "Centos66 basic vmtests are failing with
AssertionError"
https://bugs.launchpad.net/curtin/+bug/1874100
For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/382704
--
Your team curtin developers is requested to review the proposed merge of
~raharper/curtin:fix/vmtest-centos-basic into curtin:master.
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index bb6d3a4..b442d8b 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -132,7 +132,11 @@ class TestBasicAbs(VMBaseClass):
def test_partition_numbers(self):
# pnum_disk should have partitions 1 2, and 10
- disk = self._dname_to_kname('pnum_disk')
+ if self.target_release != 'centos66':
+ disk = self._dname_to_kname('pnum_disk')
+ else:
+ disk = self._serial_to_kname('disk-d')
+
expected = [disk + s for s in ["", "1", "2", "10"]]
self._test_partition_numbers(disk, expected)
@@ -291,7 +295,10 @@ class TestBasicScsiAbs(TestBasicAbs):
def test_partition_numbers(self):
# pnum_disk should have partitions 1, 2, and 10
- disk = self._dname_to_kname('pnum_disk')
+ if self.target_release != 'centos66':
+ disk = self._dname_to_kname('pnum_disk')
+ else:
+ disk = 'sdd'
expected = [disk + s for s in ["", "1", "2", "10"]]
self._test_partition_numbers(disk, expected)
--
Mailing list: https://launchpad.net/~curtin-dev
Post to : curtin-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~curtin-dev
More help : https://help.launchpad.net/ListHelp
