StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor ok_for_xxx tests a bit

This commit is contained in:
Michael Hudson-Doyle 2023-07-10 13:14:57 +12:00
parent 5af40f0b28
commit 35924d465c
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquity/common/filesystem/tests/test_actions.py
View File

@ -297,8 +297,7 @@ class TestActions(unittest.TestCase):
model.add_volgroup('vg0', {raid1p1}) model.add_volgroup('vg0', {raid1p1})
self.assertActionNotPossible(raid1, DeviceAction.REFORMAT) self.assertActionNotPossible(raid1, DeviceAction.REFORMAT)
raid2 = make_raid(model) raid2 = make_raid(model, preserve=True)
raid2.preserve = True
self.assertActionNotPossible(raid2, DeviceAction.REFORMAT) self.assertActionNotPossible(raid2, DeviceAction.REFORMAT)
raid2p1 = make_partition(model, raid2, preserve=True) raid2p1 = make_partition(model, raid2, preserve=True)
self.assertActionPossible(raid2, DeviceAction.REFORMAT) self.assertActionPossible(raid2, DeviceAction.REFORMAT)

38
subiquity/models/tests/test_filesystem.py
View File

@ -202,10 +202,13 @@ def make_model_and_partition(bootloader=None):
return model, make_partition(model, disk) return model, make_partition(model, disk)
def make_raid(model): def make_raid(model, **kw):
name = 'md%s' % len(model._actions) name = 'md%s' % len(model._actions)
return model.add_raid( r = model.add_raid(
name, 'raid1', {make_disk(model), make_disk(model)}, set()) name, 'raid1', {make_disk(model), make_disk(model)}, set())
for k, v in kw.items():
setattr(r, k, v)
return r
def make_model_and_raid(bootloader=None): def make_model_and_raid(bootloader=None):
@ -263,25 +266,23 @@ class TestFilesystemModel(unittest.TestCase):
def _test_ok_for_xxx(self, model, make_new_device, attr, def _test_ok_for_xxx(self, model, make_new_device, attr,
test_partitions=True): test_partitions=True):
# Newly formatted devs are ok_for_raid # Newly formatted devs are ok_for_raid
dev1 = make_new_device() dev1 = make_new_device(model)
self.assertTrue(getattr(dev1, attr)) self.assertTrue(getattr(dev1, attr))
# A freshly formatted dev is not ok_for_raid # A freshly formatted dev is not ok_for_raid
dev2 = make_new_device() dev2 = make_new_device(model)
model.add_filesystem(dev2, 'ext4') model.add_filesystem(dev2, 'ext4')
self.assertFalse(getattr(dev2, attr)) self.assertFalse(getattr(dev2, attr))
if test_partitions: if test_partitions:
# A device with a partition is not ok_for_raid # A device with a partition is not ok_for_raid
dev3 = make_new_device() dev3 = make_new_device(model)
make_partition(model, dev3) make_partition(model, dev3)
self.assertFalse(getattr(dev3, attr)) self.assertFalse(getattr(dev3, attr))
# Empty existing devices are ok # Empty existing devices are ok
dev4 = make_new_device() dev4 = make_new_device(model, preserve=True)
dev4.preserve = True
self.assertTrue(getattr(dev4, attr)) self.assertTrue(getattr(dev4, attr))
# A dev with an existing filesystem is ok (there is no # A dev with an existing filesystem is ok (there is no
# way to remove the format) # way to remove the format)
dev5 = make_new_device() dev5 = make_new_device(model, preserve=True)
dev5.preserve = True
fs = model.add_filesystem(dev5, 'ext4') fs = model.add_filesystem(dev5, 'ext4')
fs.preserve = True fs.preserve = True
self.assertTrue(dev5.ok_for_raid) self.assertTrue(dev5.ok_for_raid)
@ -291,18 +292,15 @@ class TestFilesystemModel(unittest.TestCase):
def test_disk_ok_for_xxx(self): def test_disk_ok_for_xxx(self):
model = make_model() model = make_model()
self._test_ok_for_xxx(
model, lambda: make_disk(model), "ok_for_raid") self._test_ok_for_xxx(model, make_disk, "ok_for_raid")
self._test_ok_for_xxx( self._test_ok_for_xxx(model, make_disk, "ok_for_lvm_vg")
model, lambda: make_disk(model), "ok_for_lvm_vg")
def test_partition_ok_for_xxx(self): def test_partition_ok_for_xxx(self):
model = make_model() model = make_model()
def make_new_device(): self._test_ok_for_xxx(model, make_partition, "ok_for_raid", False)
return make_partition(model) self._test_ok_for_xxx(model, make_partition, "ok_for_lvm_vg", False)
self._test_ok_for_xxx(model, make_new_device, "ok_for_raid", False)
self._test_ok_for_xxx(model, make_new_device, "ok_for_lvm_vg", False)
part = make_partition(make_model(Bootloader.BIOS), flag='bios_grub') part = make_partition(make_model(Bootloader.BIOS), flag='bios_grub')
self.assertFalse(part.ok_for_raid) self.assertFalse(part.ok_for_raid)
@ -317,10 +315,8 @@ class TestFilesystemModel(unittest.TestCase):
def test_raid_ok_for_xxx(self): def test_raid_ok_for_xxx(self):
model = make_model() model = make_model()
def make_new_device(): self._test_ok_for_xxx(model, make_raid, "ok_for_raid", False)
return make_raid(model) self._test_ok_for_xxx(model, make_raid, "ok_for_lvm_vg", False)
self._test_ok_for_xxx(model, make_new_device, "ok_for_raid", False)
self._test_ok_for_xxx(model, make_new_device, "ok_for_lvm_vg", False)
def test_vg_ok_for_xxx(self): def test_vg_ok_for_xxx(self):
model, vg = make_model_and_vg() model, vg = make_model_and_vg()