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

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

Browse Source 
* origin/pr/311:
  Add a test for loading volume config from XML
  Fix ThinVolume.size initialization from string
This commit is contained in:
Marek Marczykowski-Górecki 2020-01-24 01:38:16 +01:00
commit 869f963335
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubes/storage/lvm.py
View File

@ -314,9 +314,9 @@ class ThinVolume(qubes.storage.Volume):
''' # pylint: disable=too-few-public-methods ''' # pylint: disable=too-few-public-methods
def __init__(self, volume_group, size=0, **kwargs): def __init__(self, volume_group, **kwargs):
self.volume_group = volume_group self.volume_group = volume_group
super(ThinVolume, self).__init__(size=size, **kwargs) super(ThinVolume, self).__init__(**kwargs)
self.log = logging.getLogger('qubes.storage.lvm.%s' % str(self.pool)) self.log = logging.getLogger('qubes.storage.lvm.%s' % str(self.pool))
if self.snap_on_start or self.save_on_stop: if self.snap_on_start or self.save_on_stop:
@ -324,7 +324,6 @@ class ThinVolume(qubes.storage.Volume):
if self.save_on_stop: if self.save_on_stop:
self._vid_import = self.vid + '-import' self._vid_import = self.vid + '-import'
self._size = size
self._lock = asyncio.Lock() self._lock = asyncio.Lock()
@property @property

24
qubes/tests/vm/appvm.py
View File

@ -1,4 +1,4 @@
# -*- encoding: utf8 -*- # -*- encoding: utf-8 -*-
# #
# The Qubes OS Project, http://www.qubes-os.org # The Qubes OS Project, http://www.qubes-os.org
# #
@ -157,3 +157,25 @@ class TC_90_AppVM(qubes.tests.vm.qubesvm.QubesVMTestsMixin,
self.assertEqual(vm.template_for_dispvms, False) self.assertEqual(vm.template_for_dispvms, False)
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
vm.dispvm_allowed vm.dispvm_allowed
def test_600_load_volume_config(self):
xml_template = '''
<domain class="AppVM" id="domain-1">
<properties>
<property name="qid">1</property>
<property name="name">testvm</property>
<property name="label" ref="label-1" />
</properties>
<volume-config>
<volume name="root" pool="lvm" revisions_to_keep="3" rw="True"
size="1234" vid="qubes_dom0/vm-testvm-root" />
</volume-config>
</domain>
'''
xml = lxml.etree.XML(xml_template)
vm = qubes.vm.appvm.AppVM(self.app, xml)
self.assertEqual(vm.volume_config['root']['revisions_to_keep'], '3')
self.assertEqual(vm.volume_config['root']['rw'], True)
self.assertEqual(vm.volume_config['root']['size'], '1234')
self.assertEqual(vm.volume_config['root']['vid'],
'qubes_dom0/vm-testvm-root')