Merge pull request #1363 from dbungert/guided-target-reformat-min-size
guided reformat: check min size
This commit is contained in:
commit
6b1909f6c5
|
@ -407,8 +407,9 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
|
||||||
install_min = self.calculate_suggested_install_min()
|
install_min = self.calculate_suggested_install_min()
|
||||||
|
|
||||||
for disk in self.get_guided_disks(with_reformatting=True):
|
for disk in self.get_guided_disks(with_reformatting=True):
|
||||||
reformat = GuidedStorageTargetReformat(disk_id=disk.id)
|
if disk.size >= install_min:
|
||||||
scenarios.append((disk.size, reformat))
|
reformat = GuidedStorageTargetReformat(disk_id=disk.id)
|
||||||
|
scenarios.append((disk.size, reformat))
|
||||||
|
|
||||||
for disk in self.get_guided_disks(with_reformatting=False):
|
for disk in self.get_guided_disks(with_reformatting=False):
|
||||||
if len(disk.partitions()) < 1:
|
if len(disk.partitions()) < 1:
|
||||||
|
|
|
@ -170,6 +170,12 @@ class TestGuidedV2(IsolatedAsyncioTestCase):
|
||||||
resp = await self.fsc.v2_guided_GET()
|
resp = await self.fsc.v2_guided_GET()
|
||||||
self.assertEqual(expected, resp.possible)
|
self.assertEqual(expected, resp.possible)
|
||||||
|
|
||||||
|
@parameterized.expand(bootloaders_and_ptables)
|
||||||
|
async def test_small_blank_disk(self, bootloader, ptable):
|
||||||
|
self._setup(bootloader, ptable, size=1 << 30)
|
||||||
|
resp = await self.fsc.v2_guided_GET()
|
||||||
|
self.assertEqual(0, len(resp.possible))
|
||||||
|
|
||||||
@parameterized.expand(bootloaders_and_ptables)
|
@parameterized.expand(bootloaders_and_ptables)
|
||||||
async def test_used_half_disk(self, bootloader, ptable):
|
async def test_used_half_disk(self, bootloader, ptable):
|
||||||
self._setup(bootloader, ptable, size=100 << 30)
|
self._setup(bootloader, ptable, size=100 << 30)
|
||||||
|
|
Loading…
Reference in New Issue