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

Merge remote-tracking branch 'qubesos/pr/68'

Browse Source 
* qubesos/pr/68:
  Add test of qvm_prefs for specal case "None"
  Change "None" in qvm_prefs
  Change "None" to Property None

Fixes QubesOS/qubes-issues#3942
This commit is contained in:
Marek Marczykowski-Górecki 2018-06-27 03:02:34 +02:00
commit d995e2b213
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qubesadmin/tests/tools/qvm_prefs.py
View File

@ -135,3 +135,29 @@ class TC_00_qvm_prefs(qubesadmin.tests.QubesTestCase):
qubesadmin.tools.qvm_prefs.main(['dom0', 'prop1'], app=self.app) qubesadmin.tools.qvm_prefs.main(['dom0', 'prop1'], app=self.app)
self.assertEqual('', stdout.getvalue()) self.assertEqual('', stdout.getvalue())
self.assertAllCalled() self.assertAllCalled()
def test_008_set_vm_prop_none(self):
self.app.expected_calls[
('dom0', 'admin.vm.List', None, None)] = \
b'0\x00dom0 class=AdminVM state=Running\n'
self.app.expected_calls[
('dom0', 'admin.vm.property.Set', 'netvm', b'')] = \
b'0\x00'
self.app.expected_calls[
('dom0', 'admin.vm.property.Set', 'default_dispvm', b'')] = \
b'0\x00'
self.app.expected_calls[
('dom0', 'admin.vm.property.Set', 'user', b'none')] = \
b'0\x00'
self.app.expected_calls[
('dom0', 'admin.vm.property.Set', 'prop1', b'None')] = \
b'0\x00'
self.assertEqual(0, qubesadmin.tools.qvm_prefs.main([
'dom0', 'netvm', 'None'], app=self.app))
self.assertEqual(0, qubesadmin.tools.qvm_prefs.main([
'dom0', 'default_dispvm', 'none'], app=self.app))
self.assertEqual(0, qubesadmin.tools.qvm_prefs.main([
'dom0', 'user', 'none'], app=self.app))
self.assertEqual(0, qubesadmin.tools.qvm_prefs.main([
'dom0', 'prop1', 'None'], app=self.app))
self.assertAllCalled()

3
qubesadmin/tools/qvm_prefs.py
View File

@ -112,6 +112,9 @@ def process_actions(parser, args, target):
args.property = args.property.replace('-', '_') args.property = args.property.replace('-', '_')
if args.value is not None: if args.value is not None:
if str(args.value).lower() == "none":
if args.property in ["default_dispvm", "netvm", "template"]:
args.value = ''
try: try:
setattr(target, args.property, args.value) setattr(target, args.property, args.value)
except AttributeError: except AttributeError: