From 2cf056ad08986a10fe9a692329d3afc78e0ab3a6 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 20 Jul 2022 22:45:53 -0600 Subject: [PATCH] guided reformat: check min size --- subiquity/server/controllers/filesystem.py | 5 +++-- subiquity/server/controllers/tests/test_filesystem.py | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py index 8267174f..574372e4 100644 --- a/subiquity/server/controllers/filesystem.py +++ b/subiquity/server/controllers/filesystem.py @@ -407,8 +407,9 @@ class FilesystemController(SubiquityController, FilesystemManipulator): install_min = self.calculate_suggested_install_min() for disk in self.get_guided_disks(with_reformatting=True): - reformat = GuidedStorageTargetReformat(disk_id=disk.id) - scenarios.append((disk.size, reformat)) + if disk.size >= install_min: + reformat = GuidedStorageTargetReformat(disk_id=disk.id) + scenarios.append((disk.size, reformat)) for disk in self.get_guided_disks(with_reformatting=False): if len(disk.partitions()) < 1: diff --git a/subiquity/server/controllers/tests/test_filesystem.py b/subiquity/server/controllers/tests/test_filesystem.py index 602c3478..6e0124d0 100644 --- a/subiquity/server/controllers/tests/test_filesystem.py +++ b/subiquity/server/controllers/tests/test_filesystem.py @@ -170,6 +170,12 @@ class TestGuidedV2(IsolatedAsyncioTestCase): resp = await self.fsc.v2_guided_GET() 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) async def test_used_half_disk(self, bootloader, ptable): self._setup(bootloader, ptable, size=100 << 30)