saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move runner tests to the front to clean up the output

Browse source
This commit is contained in:
Thomas S Hatch 2012-05-30 17:10:48 -06:00
parent c6e818f01b
commit dc6138b787
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/runtests.py
View file

@ -22,6 +22,9 @@ PNUM = 50
def run_suite(opts, path, display_name, suffix='[!_]*.py'):
'''
Execute a unit test suite
'''
loader = saltunittest.TestLoader()
if opts.name:
tests = loader.loadTestsFromName(opts.name)
@ -39,6 +42,9 @@ def run_suite(opts, path, display_name, suffix='[!_]*.py'):
def run_integration_suite(opts, suite_folder, display_name):
'''
Run an integration test suite
'''
path = os.path.join(TEST_DIR, 'integration', suite_folder)
return run_suite(opts, path, display_name)
@ -58,6 +64,8 @@ def run_integration_tests(opts):
if opts.name:
results = run_suite(opts, '', opts.name)
status.append(results)
if opts.runner:
status.append(run_integration_suite(opts, 'runners', 'Runner'))
if opts.module:
status.append(run_integration_suite(opts, 'modules', 'Module'))
if opts.state:
@ -66,8 +74,6 @@ def run_integration_tests(opts):
status.append(run_integration_suite(opts, 'client', 'Client'))
if opts.shell:
status.append(run_integration_suite(opts, 'shell', 'Shell'))
if opts.runner:
status.append(run_integration_suite(opts, 'runners', 'Runner'))
return status