fix tests
This commit is contained in:
parent
be165d941c
commit
04c296f5e6
|
@ -1455,21 +1455,22 @@ class FilesystemModel(object):
|
|||
def all_volgroups(self):
|
||||
return [a for a in self._actions if a.type == 'lvm_volgroup']
|
||||
|
||||
def add_partition(self, disk, size, flag="", wipe=None):
|
||||
if size > disk.free_for_partitions:
|
||||
raise Exception("%s > %s", size, disk.free_for_partitions)
|
||||
def add_partition(self, device, size, flag="", wipe=None):
|
||||
if size > device.free_for_partitions:
|
||||
raise Exception("%s > %s", size, device.free_for_partitions)
|
||||
real_size = align_up(size)
|
||||
log.debug("add_partition: rounded size from %s to %s", size, real_size)
|
||||
if disk._fs is not None:
|
||||
raise Exception("%s is already formatted" % (disk.label,))
|
||||
if device._fs is not None:
|
||||
raise Exception("%s is already formatted" % (device.label,))
|
||||
p = Partition(
|
||||
m=self, device=disk, size=real_size, flag=flag, wipe=wipe)
|
||||
m=self, device=device, size=real_size, flag=flag, wipe=wipe)
|
||||
if flag in ("boot", "bios_grub", "prep"):
|
||||
disk._partitions.insert(0, disk._partitions.pop())
|
||||
disk.ptable = disk.ptable_for_new_partition()
|
||||
dasd = disk.dasd()
|
||||
if dasd is not None:
|
||||
dasd.disk_layout = 'ldl'
|
||||
device._partitions.insert(0, device._partitions.pop())
|
||||
device.ptable = device.ptable_for_new_partition()
|
||||
if device.type == 'disk':
|
||||
dasd = device.dasd()
|
||||
if dasd is not None:
|
||||
dasd.device_layout = 'ldl'
|
||||
self._actions.append(p)
|
||||
return p
|
||||
|
||||
|
|
|
@ -142,6 +142,7 @@ def make_disk(model, **kw):
|
|||
model._actions.append(Disk(
|
||||
m=model, serial=serial,
|
||||
info=FakeStorageInfo(size=100*(2**30)),
|
||||
path='/dev/thing',
|
||||
**kw))
|
||||
disk = model._actions[-1]
|
||||
return disk
|
||||
|
|
|
@ -32,8 +32,9 @@ class FilesystemViewTests(unittest.TestCase):
|
|||
|
||||
def test_one_disk(self):
|
||||
model = mock.create_autospec(spec=FilesystemModel)
|
||||
model._orig_config = []
|
||||
disk = Disk(
|
||||
m=model, serial="DISK-SERIAL",
|
||||
m=model, serial="DISK-SERIAL", path='/dev/thing',
|
||||
info=FakeStorageInfo(size=100*(2**20), free=50*(2**20)))
|
||||
view = self.make_view(model, [disk])
|
||||
w = view_helpers.find_with_pred(
|
||||
|
|
Loading…
Reference in New Issue