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

tests: fix extra tests loader

Browse Source 
Fix load error reporting - make sure 'err' variable is transferred into
'runTest' function scope.
Then, relax test loading requirements - use 'resolve' instead of 'load',
to bypass dependencies check (defined in setup.py of the package). The
required dependencies should be handled by RPM already, and in some
cases may not match those in python package. An example is PDF
converter, where dependencies at python level are set for the actual
converter, which is irrelevant for running tests from dom0 (tests will
interact with PDF converter inside a VM).
This commit is contained in:
Marek Marczykowski-Górecki 2020-06-24 01:27:57 +02:00
parent c4739b7ed0
commit 1ebbfa8dbc
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/tests/extra.py
View File

@ -211,11 +211,11 @@ def load_tests(loader, tests, pattern):
if entry.name in exclude_list: if entry.name in exclude_list:
continue continue
try: try:
for test_case in entry.load()(): for test_case in entry.resolve()():
tests.addTests(loader.loadTestsFromNames([ tests.addTests(loader.loadTestsFromNames([
'{}.{}'.format(test_case.__module__, test_case.__name__)])) '{}.{}'.format(test_case.__module__, test_case.__name__)]))
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
def runTest(self): def runTest(self, err=err):
raise err raise err
ExtraLoadFailure = type('ExtraLoadFailure', ExtraLoadFailure = type('ExtraLoadFailure',
(qubes.tests.QubesTestCase,), (qubes.tests.QubesTestCase,),
@ -229,13 +229,13 @@ def load_tests(loader, tests, pattern):
if entry.name in exclude_list: if entry.name in exclude_list:
continue continue
try: try:
for test_case in entry.load()(): for test_case in entry.resolve()():
tests.addTests(loader.loadTestsFromNames( tests.addTests(loader.loadTestsFromNames(
qubes.tests.create_testcases_for_templates( qubes.tests.create_testcases_for_templates(
test_case.__name__, test_case, test_case.__name__, test_case,
module=sys.modules[test_case.__module__]))) module=sys.modules[test_case.__module__])))
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
def runTest(self): def runTest(self, err=err):
raise err raise err
ExtraForTemplateLoadFailure = type('ExtraForTemplateLoadFailure', ExtraForTemplateLoadFailure = type('ExtraForTemplateLoadFailure',
(qubes.tests.QubesTestCase,), (qubes.tests.QubesTestCase,),