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

tests: fix handling tests list from cmdline

Browse Source 
Previous approach didn't worked for dynamically generated tests.
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-30 01:40:39 +02:00
parent 01e208d5ec
commit c6f136869e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/run.py
View File

@ -303,8 +303,11 @@ def main():
loader = unittest.TestLoader() loader = unittest.TestLoader()
if args.names: if args.names:
suite.addTests(loader.loadTestsFromNames( alltests = loader.loadTestsFromName('qubes.tests')
('qubes.tests.' + name.replace('/', '.') for name in args.names))) for name in args.names:
suite.addTests(
[test for test in list_test_cases(alltests)
if (str(test)+'/').startswith(name.replace('.', '/')+'/')])
else: else:
suite.addTests(loader.loadTestsFromName('qubes.tests')) suite.addTests(loader.loadTestsFromName('qubes.tests'))

1
tests/vm_qrexec_gui.py
View File

@ -564,5 +564,4 @@ def load_tests(loader, tests, pattern):
(TC_20_DispVMMixin, qubes.tests.QubesTestCase), (TC_20_DispVMMixin, qubes.tests.QubesTestCase),
{'template': template}))) {'template': template})))
tests.addTests(loader.loadTestsFromTestCase(TC_10_HVM))
return tests return tests