parent
3f66da0412
commit
02c601b830
@ -36,6 +36,7 @@ import unittest.case
|
||||
|
||||
import lxml.etree
|
||||
import sys
|
||||
import pkg_resources
|
||||
|
||||
import qubes.backup
|
||||
import qubes.qubes
|
||||
@ -490,6 +491,12 @@ class SystemTestsMixin(object):
|
||||
subprocess.check_call(command)
|
||||
|
||||
def shutdown_and_wait(self, vm, timeout=60):
|
||||
"""
|
||||
|
||||
:param vm: VM object
|
||||
:param timeout: timeout after which fail the test
|
||||
:return:
|
||||
"""
|
||||
vm.shutdown()
|
||||
while timeout > 0:
|
||||
if not vm.is_running():
|
||||
@ -733,6 +740,48 @@ class BackupTestsMixin(SystemTestsMixin):
|
||||
f.truncate(size)
|
||||
f.close()
|
||||
|
||||
class ExtraTestMixin(SystemTestsMixin):
|
||||
|
||||
template = None
|
||||
|
||||
def setUp(self):
|
||||
super(ExtraTestMixin, self).setUp()
|
||||
self.qc.unlock_db()
|
||||
|
||||
def create_vms(self, names):
|
||||
"""
|
||||
Create AppVMs for the duration of the test. Will be automatically
|
||||
removed after completing the test.
|
||||
:param names: list of VM names to create (each of them will be
|
||||
prefixed with some test specific string)
|
||||
:return: list of created VM objects
|
||||
"""
|
||||
self.qc.lock_db_for_writing()
|
||||
self.qc.load()
|
||||
if self.template:
|
||||
template = self.qc.get_vm_by_name(self.template)
|
||||
else:
|
||||
template = self.qc.get_default_template()
|
||||
for vmname in names:
|
||||
vm = self.qc.add_new_vm("QubesAppVm",
|
||||
name=self.make_vm_name(vmname),
|
||||
template=template)
|
||||
vm.create_on_disk(verbose=False)
|
||||
self.save_and_reload_db()
|
||||
|
||||
# get objects after reload
|
||||
vms = []
|
||||
for vmname in names:
|
||||
vms.append(self.qc.get_vm_by_name(self.make_vm_name(vmname)))
|
||||
return vms
|
||||
|
||||
def enable_network(self):
|
||||
"""
|
||||
Enable access to the network. Must be called before creating VMs.
|
||||
"""
|
||||
# nothing to do in core2
|
||||
pass
|
||||
|
||||
|
||||
def load_tests(loader, tests, pattern):
|
||||
# discard any tests from this module, because it hosts base classes
|
||||
@ -752,6 +801,40 @@ def load_tests(loader, tests, pattern):
|
||||
):
|
||||
tests.addTests(loader.loadTestsFromName(modname))
|
||||
|
||||
for entry in pkg_resources.iter_entry_points('qubes.tests.extra'):
|
||||
for test_case in entry():
|
||||
tests.addTests(loader.loadTestsFromTestCase(
|
||||
type(
|
||||
entry.name + '_' + test_case.__name__,
|
||||
(test_case, ExtraTestMixin, QubesTestCase),
|
||||
{}
|
||||
)
|
||||
))
|
||||
|
||||
|
||||
try:
|
||||
qc = qubes.qubes.QubesVmCollection()
|
||||
qc.lock_db_for_reading()
|
||||
qc.load()
|
||||
qc.unlock_db()
|
||||
templates = [vm.name for vm in qc.values() if
|
||||
isinstance(vm, qubes.qubes.QubesTemplateVm)]
|
||||
except OSError:
|
||||
templates = []
|
||||
|
||||
for entry in pkg_resources.iter_entry_points(
|
||||
'qubes.tests.extra.for_template'):
|
||||
for test_case in entry():
|
||||
for template in templates:
|
||||
tests.addTests(loader.loadTestsFromTestCase(
|
||||
type(
|
||||
entry.name + '_' + test_case.__name__,
|
||||
(test_case, ExtraTestMixin,
|
||||
QubesTestCase),
|
||||
{'template': template}
|
||||
)
|
||||
))
|
||||
|
||||
return tests
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user