Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/qvm-volume: fix default action handling

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-20 12:13:05 +02:00
parent ae0729fb53
commit 3c9fb8dbac
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesadmin/tests/tools/qvm_volume.py
View File

@ -132,6 +132,21 @@ class TC_00_qvm_volume(qubesadmin.tests.QubesTestCase):
) )
self.assertAllCalled() self.assertAllCalled()
def test_005_list_default_action(self):
self.setup_expected_calls_for_list()
with qubesadmin.tests.tools.StdoutBuffer() as stdout:
self.assertEqual(0,
qubesadmin.tools.qvm_volume.main([], app=self.app))
self.assertEqual(stdout.getvalue(),
'POOL:VOLUME VMNAME VOLUME_NAME '
'REVERT_POSSIBLE\n'
'other-pool:sys-net-private sys-net private Yes\n'
'other-pool:vm1-private vm1 private Yes\n'
'pool-file:sys-net-root sys-net root No\n'
'pool-file:vm1-root vm1 root No\n'
)
self.assertAllCalled()
def test_010_extend(self): def test_010_extend(self):
self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
b'0\x00testvm class=AppVM state=Running\n' b'0\x00testvm class=AppVM state=Running\n'

6
qubesadmin/tools/qvm_volume.py
View File

@ -95,7 +95,7 @@ def list_volumes(args):
domains = app.domains domains = app.domains
volumes = [v for vm in domains for v in vm.volumes.values()] volumes = [v for vm in domains for v in vm.volumes.values()]
if args.pools: if getattr(args, 'pools', None):
# only specified pools # only specified pools
volumes = [v for v in volumes if v.pool in args.pools] volumes = [v for v in volumes if v.pool in args.pools]
@ -126,7 +126,9 @@ def list_volumes(args):
if x.domains] if x.domains]
else: else:
result = [x for p in vd_dict.values() for x in p.values()] result = [x for p in vd_dict.values() for x in p.values()]
qubesadmin.tools.print_table(prepare_table(result, full=args.full))
qubesadmin.tools.print_table(
prepare_table(result, full=getattr(args, 'full', False)))
def revert_volume(args): def revert_volume(args):