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

storage/v2: enable test using space at end

This commit is contained in:
Dan Bungert 2022-03-23 14:34:11 -06:00
parent efd62ea380
commit 3c0814897e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subiquity/tests/api/test_api.py
View File

@ -101,7 +101,7 @@ class Server(Client):
return return
async def spawn(self, output_base, socket, machine_config, async def spawn(self, output_base, socket, machine_config,
bootloader='uefi'): bootloader='uefi', extra_args=None):
env = os.environ.copy() env = os.environ.copy()
env['SUBIQUITY_REPLAY_TIMESCALE'] = '100' env['SUBIQUITY_REPLAY_TIMESCALE'] = '100'
cmd = ['python3', '-m', 'subiquity.cmd.server', cmd = ['python3', '-m', 'subiquity.cmd.server',
@ -110,6 +110,8 @@ class Server(Client):
'--socket', socket, '--socket', socket,
'--output-base', output_base, '--output-base', output_base,
'--machine-config', machine_config] '--machine-config', machine_config]
if extra_args is not None:
cmd.extend(extra_args)
self.proc = await astart_command(cmd, env=env) self.proc = await astart_command(cmd, env=env)
async def close(self): async def close(self):
@ -800,10 +802,10 @@ class TestPartitionTableEditing(TestAPI):
await inst.post('/storage/v2/add_partition', data) await inst.post('/storage/v2/add_partition', data)
@timeout() @timeout()
async def SKIP_test_try_to_use_free_space(self): async def test_use_free_space_after_existing(self):
# disabled until we can modify existing partition tables cfg = 'examples/ubuntu-and-free-space.json'
# see also parts_and_gaps_disk() extra = ['--storage-version', '2']
async with start_server('examples/ubuntu-and-free-space.json') as inst: async with start_server(cfg, extra_args=extra) as inst:
# Disk has 3 existing partitions and free space. Add one to end. # Disk has 3 existing partitions and free space. Add one to end.
data = { data = {
'disk_id': 'disk-sda', 'disk_id': 'disk-sda',
@ -812,8 +814,7 @@ class TestPartitionTableEditing(TestAPI):
'mount': '/', 'mount': '/',
} }
} }
await inst.post('/storage/v2/add_partition', data) resp = await inst.post('/storage/v2/add_partition', data)
resp = await inst.get('/storage')
json_print(resp) json_print(resp)