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

Merge remote-tracking branch 'origin/pr/119'

Browse Source 
* origin/pr/119:
  Fixed metadata usage being served as strings
This commit is contained in:
Marek Marczykowski-Górecki 2019-11-26 23:40:37 +01:00
commit a722e4234e
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubesadmin/storage.py
View File

@ -278,7 +278,12 @@ class Pool(object):
pool_usage_data = pool_usage_data.decode('utf-8') pool_usage_data = pool_usage_data.decode('utf-8')
assert pool_usage_data.endswith('\n') or pool_usage_data == '' assert pool_usage_data.endswith('\n') or pool_usage_data == ''
pool_usage_data = pool_usage_data[:-1] pool_usage_data = pool_usage_data[:-1]
return dict(l.split('=', 1) for l in pool_usage_data.splitlines())
def _int_split(text): # pylint: disable=missing-docstring
key, value = text.split("=", 1)
return key, int(value)
return dict(_int_split(l) for l in pool_usage_data.splitlines())
@property @property
def config(self): def config(self):

8
qubesadmin/tests/storage.py
View File

@ -313,10 +313,10 @@ class TestPool(qubesadmin.tests.QubesTestCase):
b'metadata_usage=50\n' b'metadata_usage=50\n'
pool = self.app.pools['lvm'] pool = self.app.pools['lvm']
self.assertEqual(pool.usage_details, { self.assertEqual(pool.usage_details, {
'data_size': '204800', 'data_size': 204800,
'data_usage': '102400', 'data_usage': 102400,
'metadata_size': '1024', 'metadata_size': 1024,
'metadata_usage': '50', 'metadata_usage': 50,
}) })
self.assertAllCalled() self.assertAllCalled()