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

Fix setting VM property to None

Browse Source 
None value should be encoded as empty string.
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-25 12:30:19 +02:00
parent 1aab64d5b0
commit c988ef41a3
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesadmin/base.py
View File

@ -211,6 +211,8 @@ class PropertyHolder(object):
else: else:
if isinstance(value, qubesadmin.vm.QubesVM): if isinstance(value, qubesadmin.vm.QubesVM):
value = value.name value = value.name
if value is None:
value = ''
try: try:
self.qubesd_call( self.qubesd_call(
self._method_dest, self._method_dest,

2
qubesadmin/tests/vm/properties.py
View File

@ -145,7 +145,7 @@ class TC_00_Properties(qubesadmin.tests.vm.VMTestCase):
def test_024_set_none(self): def test_024_set_none(self):
self.app.expected_calls[ self.app.expected_calls[
('test-vm', 'admin.vm.property.Set', 'prop1', b'None')] = \ ('test-vm', 'admin.vm.property.Set', 'prop1', b'')] = \
b'0\x00' b'0\x00'
self.vm.prop1 = None self.vm.prop1 = None
self.assertAllCalled() self.assertAllCalled()