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

tests: convert 'extra' test loader to core3 API

Browse Source 
QubesOS/qubes-issues#1800
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-11 13:50:19 +02:00
parent 8c6fe7ed90
commit eaf5efd814
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/extra.py → qubes/tests/extra.py
View File

@ -24,17 +24,14 @@
import pkg_resources import pkg_resources
import qubes.tests import qubes.tests
import qubes.qubes import qubes.vm.appvm
import qubes.vm.templatevm
class ExtraTestMixin(qubes.tests.SystemTestsMixin): class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
template = None template = None
def setUp(self):
super(ExtraTestMixin, self).setUp()
self.qc.unlock_db()
def create_vms(self, names): def create_vms(self, names):
""" """
Create AppVMs for the duration of the test. Will be automatically Create AppVMs for the duration of the test. Will be automatically
@ -43,52 +40,39 @@ class ExtraTestMixin(qubes.tests.SystemTestsMixin):
prefixed with some test specific string) prefixed with some test specific string)
:return: list of created VM objects :return: list of created VM objects
""" """
self.qc.lock_db_for_writing()
self.qc.load()
if self.template: if self.template:
template = self.qc.get_vm_by_name(self.template) template = self.app.domains[self.template]
else: else:
template = self.qc.get_default_template() template = self.app.default_template
for vmname in names: for vmname in names:
vm = self.qc.add_new_vm("QubesAppVm", vm = self.app.add_new_vm(qubes.vm.appvm.AppVM,
name=self.make_vm_name(vmname), name=self.make_vm_name(vmname),
template=template) template=template)
vm.create_on_disk(verbose=False) vm.create_on_disk(verbose=False)
self.save_and_reload_db() self.save_and_reload_db()
self.qc.unlock_db()
# get objects after reload # get objects after reload
vms = [] vms = []
for vmname in names: for vmname in names:
vms.append(self.qc.get_vm_by_name(self.make_vm_name(vmname))) vms.append(self.app.domains[self.make_vm_name])
return vms return vms
def enable_network(self): def enable_network(self):
""" """
Enable access to the network. Must be called before creating VMs. Enable access to the network. Must be called before creating VMs.
""" """
# nothing to do in core2 self.init_networking()
pass
def load_tests(loader, tests, pattern): def load_tests(loader, tests, pattern):
for entry in pkg_resources.iter_entry_points('qubes.tests.extra'): for entry in pkg_resources.iter_entry_points('qubes.tests.extra'):
for test_case in entry(): for test_case in entry():
tests.addTests(loader.loadTestsFromTestCase( tests.addTests(loader.loadTestsFromTestCase(test_case))
type(
entry.name + '_' + test_case.__name__,
(test_case, ExtraTestMixin, qubes.tests.QubesTestCase),
{}
)
))
try: try:
qc = qubes.qubes.QubesVmCollection() app = qubes.Qubes()
qc.lock_db_for_reading() templates = [vm.name for vm in app.domains if
qc.load() isinstance(vm, qubes.vm.templatevm.TemplateVM)]
qc.unlock_db()
templates = [vm.name for vm in qc.values() if
isinstance(vm, qubes.qubes.QubesTemplateVm)]
except OSError: except OSError:
templates = [] templates = []
@ -100,8 +84,7 @@ def load_tests(loader, tests, pattern):
type( type(
'{}_{}_{}'.format( '{}_{}_{}'.format(
entry.name, test_case.__name__, template), entry.name, test_case.__name__, template),
(test_case, ExtraTestMixin, (test_case,),
qubes.tests.QubesTestCase),
{'template': template} {'template': template}
) )
)) ))

1
rpm_spec/core-dom0.spec
View File

@ -259,6 +259,7 @@ fi
%dir %{python_sitelib}/qubes/tests %dir %{python_sitelib}/qubes/tests
%{python_sitelib}/qubes/tests/__init__.py* %{python_sitelib}/qubes/tests/__init__.py*
%{python_sitelib}/qubes/tests/run.py* %{python_sitelib}/qubes/tests/run.py*
%{python_sitelib}/qubes/tests/extra.py*
%{python_sitelib}/qubes/tests/devices.py* %{python_sitelib}/qubes/tests/devices.py*
%{python_sitelib}/qubes/tests/events.py* %{python_sitelib}/qubes/tests/events.py*