diff options
| author | Ryan Harper <[email protected]> | 2020-02-14 09:50:10 -0600 |
|---|---|---|
| committer | Ryan Harper <[email protected]> | 2020-02-14 09:50:10 -0600 |
| commit | d06c0ce4113fda3a08ed38ff1fc4ad6ab234c1a1 (patch) | |
| tree | d3bd19d343e46b5e1c370e94af33926457508fc8 /tests/vmtests/test_lvm_raid.py | |
| parent | e95a4cfda532aa89782ef25d246cef5f023b0e08 (diff) | |
| parent | 82f23e3d28741e4d1ec50e94a6bc966500cca0bf (diff) | |
merge from upstream/master at 19.3-26-g82f23e3d
Diffstat (limited to 'tests/vmtests/test_lvm_raid.py')
| -rw-r--r-- | tests/vmtests/test_lvm_raid.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py index 24c2765e..8d42a1a5 100644 --- a/tests/vmtests/test_lvm_raid.py +++ b/tests/vmtests/test_lvm_raid.py @@ -26,15 +26,19 @@ class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs): exit 0 """)] ) - - fstab_expected = { - '/dev/vg1/lv1': '/srv/data', - '/dev/vg1/lv2': '/srv/backup', - } disk_to_check = [('main_disk', 1), ('md0', 0), ('md1', 0)] + def get_fstab_expected(self): + rootdev = self._dname_to_kname('main_disk') + homedev = self._dname_to_kname('vg0-lv--0') + return [ + (self._kname_to_byuuid(rootdev + '2'), '/', 'defaults'), + (self._kname_to_uuid_devpath('dm-uuid', homedev), + '/home', 'defaults'), + ] + def test_lvs(self): self.check_file_strippedline("lvs", "lv-0=vg0") @@ -51,10 +55,6 @@ class EoanTestLvmOverRaid(relbase.eoan, TestLvmOverRaidAbs): __test__ = True -class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs): - __test__ = True - - class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs): __test__ = True |