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

rename new function to first_gap_with_size

This commit is contained in:
Michael Hudson-Doyle 2023-08-18 15:29:20 +12:00
parent fc06fc0488
commit 778516a75c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subiquity/common/filesystem/boot.py
View File

@ -224,7 +224,7 @@ def get_add_part_plan(device, *, spec, args, resize_partition=None):
# is a bad idea. So avoid putting any sort of boot stuff on a logical - # is a bad idea. So avoid putting any sort of boot stuff on a logical -
# it's probably a bad idea for all cases. # it's probably a bad idea for all cases.
gap = gaps.gap_with_size(device, size, in_extended=False) gap = gaps.first_gap_with_size(device, size, in_extended=False)
if gap is not None: if gap is not None:
create_part_plan.gap = gap.split(size)[0] create_part_plan.gap = gap.split(size)[0]
return create_part_plan return create_part_plan

2
subiquity/common/filesystem/gaps.py
View File

@ -252,7 +252,7 @@ def largest_gap_size(device, in_extended=None):
return 0 return 0
def gap_with_size(device, size, *, in_extended=None): def first_gap_with_size(device, size, *, in_extended=None):
for pg in parts_and_gaps(device): for pg in parts_and_gaps(device):
if isinstance(pg, Gap) and pg.size >= size and pg.is_usable: if isinstance(pg, Gap) and pg.size >= size and pg.is_usable:
if in_extended is None or in_extended == pg.in_extended: if in_extended is None or in_extended == pg.in_extended:

16
subiquity/common/filesystem/tests/test_gaps.py
View File

@ -789,19 +789,19 @@ class TestGapWithSize(GapTestCase):
def test_empty_disk(self): def test_empty_disk(self):
d = make_disk(size=10 * MiB) d = make_disk(size=10 * MiB)
[g1] = gaps.parts_and_gaps(d) [g1] = gaps.parts_and_gaps(d)
self.assertEqual(g1, gaps.gap_with_size(d, MiB)) self.assertEqual(g1, gaps.first_gap_with_size(d, MiB))
def test_half_full(self): def test_half_full(self):
d = make_disk(size=10 * MiB) d = make_disk(size=10 * MiB)
make_partition(device=d, size=d.size // 2) make_partition(device=d, size=d.size // 2)
[p1, g1] = gaps.parts_and_gaps(d) [p1, g1] = gaps.parts_and_gaps(d)
self.assertEqual(g1, gaps.gap_with_size(d, MiB)) self.assertEqual(g1, gaps.first_gap_with_size(d, MiB))
def test_half_full_too_big(self): def test_half_full_too_big(self):
d = make_disk(size=10 * MiB) d = make_disk(size=10 * MiB)
make_partition(device=d, size=d.size // 2) make_partition(device=d, size=d.size // 2)
[p1, g1] = gaps.parts_and_gaps(d) [p1, g1] = gaps.parts_and_gaps(d)
self.assertIs(None, gaps.gap_with_size(d, 10 * MiB)) self.assertIs(None, gaps.first_gap_with_size(d, 10 * MiB))
def test_one_gap_too_small(self): def test_one_gap_too_small(self):
self.use_alignment_data( self.use_alignment_data(
@ -818,7 +818,7 @@ class TestGapWithSize(GapTestCase):
d = make_disk(size=100) d = make_disk(size=100)
make_partition(device=d, size=10, offset=20) make_partition(device=d, size=10, offset=20)
[g1, p1, g2] = gaps.parts_and_gaps(d) [g1, p1, g2] = gaps.parts_and_gaps(d)
self.assertEqual(g2, gaps.gap_with_size(d, 20)) self.assertEqual(g2, gaps.first_gap_with_size(d, 20))
def test_unusable(self): def test_unusable(self):
self.use_alignment_data( self.use_alignment_data(
@ -834,7 +834,7 @@ class TestGapWithSize(GapTestCase):
# ##### [ p1 ] ##### # ##### [ p1 ] #####
d = make_disk(size=100) d = make_disk(size=100)
make_partition(device=d, size=10, offset=2) make_partition(device=d, size=10, offset=2)
self.assertIs(None, gaps.gap_with_size(d, 10)) self.assertIs(None, gaps.first_gap_with_size(d, 10))
def test_in_extended(self): def test_in_extended(self):
self.use_alignment_data( self.use_alignment_data(
@ -854,6 +854,6 @@ class TestGapWithSize(GapTestCase):
make_partition(device=d, size=50, offset=20, flag="extended") make_partition(device=d, size=50, offset=20, flag="extended")
make_partition(device=d, size=18, offset=22, flag="logical") make_partition(device=d, size=18, offset=22, flag="logical")
[g1, p1, p5, g2, g3] = gaps.parts_and_gaps(d) [g1, p1, p5, g2, g3] = gaps.parts_and_gaps(d)
self.assertEqual(g2, gaps.gap_with_size(d, 20)) self.assertEqual(g2, gaps.first_gap_with_size(d, 20))
self.assertEqual(g3, gaps.gap_with_size(d, 20, in_extended=False)) self.assertEqual(g3, gaps.first_gap_with_size(d, 20, in_extended=False))
self.assertEqual(g2, gaps.gap_with_size(d, 10, in_extended=True)) self.assertEqual(g2, gaps.first_gap_with_size(d, 10, in_extended=True))