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

api/admin: fix volume info formatting

Browse Source 
Newline was put in a wrong place.

Fixes QubesOS/qubes-issues#3831
This commit is contained in:
Marek Marczykowski-Górecki 2018-04-16 22:17:48 +02:00
parent e145e85dba
commit f9e34eff51
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/api/admin.py
View File

@ -347,7 +347,7 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
info = ''.join('{}={}\n'.format(key, _serialize(getattr(volume, key))) info = ''.join('{}={}\n'.format(key, _serialize(getattr(volume, key)))
for key in volume_properties) for key in volume_properties)
try: try:
info += '\nis_outdated={}'.format(volume.is_outdated()) info += 'is_outdated={}\n'.format(volume.is_outdated())
except NotImplementedError: except NotImplementedError:
pass pass
return info return info

2
qubes/tests/api_admin.py
View File

@ -363,7 +363,7 @@ class TC_00_VMs(AdminAPITestCase):
b'private') b'private')
self.assertEqual(value, self.assertEqual(value,
''.join('{p}={p}-value\n'.format(p=p) for p in volume_properties) + ''.join('{p}={p}-value\n'.format(p=p) for p in volume_properties) +
'\nis_outdated=False') 'is_outdated=False\n')
self.assertEqual(self.vm.volumes.mock_calls, self.assertEqual(self.vm.volumes.mock_calls,
[unittest.mock.call.keys(), [unittest.mock.call.keys(),
unittest.mock.call.__getattr__('__getitem__')('private'), unittest.mock.call.__getattr__('__getitem__')('private'),