valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include outputter tests in tests suite.

Browse Source
This commit is contained in:
Pedro Algarvio 2014-05-12 19:10:11 +01:00
parent 5d779444be
commit a1aee355e5
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/runtests.py
View File

@ -109,6 +109,13 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
action='store_true',
help='Run unit tests'
)
self.test_selection_group.add_option(
'-o',
'--outputter',
action='store_true',
default=False,
help='Run outputter tests'
)
self.test_selection_group.add_option(
'--ssh',
action='store_true',
@ -129,8 +136,8 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
if self.options.coverage and any((
self.options.module, self.options.client, self.options.shell,
self.options.unit, self.options.state, self.options.runner,
self.options.loader, self.options.name, os.geteuid() != 0,
not self.options.run_destructive)):
self.options.loader, self.options.name, self.options.outputter,
os.geteuid() != 0, not self.options.run_destructive)):
self.error(
'No sense in generating the tests coverage report when '
'not running the full test suite, including the '
@ -142,7 +149,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
if not any((self.options.module, self.options.client,
self.options.shell, self.options.unit, self.options.state,
self.options.runner, self.options.loader,
self.options.name)):
self.options.name, self.options.outputter)):
self.options.module = True
self.options.client = True
self.options.shell = True
@ -150,6 +157,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
self.options.runner = True
self.options.state = True
self.options.loader = True
self.options.outputter = True
self.start_coverage(
branch=True,
@ -183,6 +191,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
self.options.module or
self.options.client or
self.options.loader or
self.options.outputter or
named_tests):
# We're either not running any of runner, state, module and client
# tests, or, we're only running unittests by passing --unit or by
@ -231,7 +240,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
if not any([self.options.client, self.options.module,
self.options.runner, self.options.shell,
self.options.state, self.options.loader,
self.options.name]):
self.options.outputter, self.options.name]):
return status
with TestDaemon(self):
@ -253,6 +262,8 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
status.append(self.run_integration_suite('client', 'Client'))
if self.options.shell:
status.append(self.run_integration_suite('shell', 'Shell'))
if self.options.outputter:
status.append(self.run_integration_suite('output', 'Outputter'))
return status
def run_unit_tests(self):