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

tests/vm: simplify AppVM storage test

Browse Source 
Use minimal TestPool(), instead of Mock().
This allow effectively compare Volume instances (init_volume with the
same parameters return equal Volume instance).
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-12 12:40:43 +02:00
parent f2f89c7b0c
commit 2df81adab1
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@
from unittest import mock from unittest import mock
import qubes.storage
import qubes.tests import qubes.tests
import qubes.tests.vm.qubesvm import qubes.tests.vm.qubesvm
import qubes.vm.appvm import qubes.vm.appvm
@ -48,12 +49,18 @@ class TestVM(object):
def is_running(self): def is_running(self):
return self.running return self.running
class TestPool(qubes.storage.Pool):
def init_volume(self, vm, volume_config):
vid = '{}/{}'.format(vm.name, volume_config['name'])
assert volume_config.pop('pool', None) == self
return qubes.storage.Volume(vid=vid, pool=self, **volume_config)
class TC_90_AppVM(qubes.tests.vm.qubesvm.QubesVMTestsMixin, class TC_90_AppVM(qubes.tests.vm.qubesvm.QubesVMTestsMixin,
qubes.tests.QubesTestCase): qubes.tests.QubesTestCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.app.pools['default'] = mock.Mock(**{ self.app.pools['default'] = TestPool('default')
'init_volume.return_value.pool': 'default'})
self.app.pools['linux-kernel'] = mock.Mock(**{ self.app.pools['linux-kernel'] = mock.Mock(**{
'init_volume.return_value.pool': 'linux-kernel'}) 'init_volume.return_value.pool': 'linux-kernel'})
self.template = qubes.vm.templatevm.TemplateVM(self.app, None, self.template = qubes.vm.templatevm.TemplateVM(self.app, None,