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

Merge branch 'tests-extra-fix'

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2020-06-24 18:02:35 +02:00
commit d0f619d3c6
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,),