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

Minor: Better support of named multimaster tests.

Browse source 
This change is not related to any tets failures and current CI
configuration at all.
This commit is contained in:
Dmitry Kuzmenko 2019-08-19 22:16:31 +03:00
parent a5cccdfc3e
commit b7a10581a2
No known key found for this signature in database
GPG key ID: 4C7CAD30C95651DA
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/runtests.py
View file

@ -861,7 +861,8 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
load_from_name=False)
status.append(results)
continue
if name.startswith(('tests.unit.', 'unit.')):
if name.startswith(('tests.unit.', 'unit.',
'tests.multimaster', 'multimaster')):
continue
results = self.run_suite(
'', name, suffix='test_*.py', load_from_name=True,
@ -883,19 +884,12 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
if self.options.name:
for test in self.options.name:
if test.startswith(('tests.unit.', 'unit.',
'test.kitchen.', 'kitchen.',
'test.integration.', 'integration.')):
named_unit_test.append(test)
continue
named_tests.append(test)
if test.startswith(('tests.multimaster.', 'multimaster.')):
named_tests.append(test)
# TODO: check 'from_filenames'
if not self.options.multimaster and not named_tests:
# We're either not running any integration test suites, or we're
# only running unit tests by passing --unit or by passing only
# `unit.<whatever>` to --name. We don't need the tests daemon
# running
# We're not running any multimaster test suites.
return [True]
if not salt.utils.platform.is_windows():
@ -910,9 +904,6 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
print_header(' * Setting up Salt daemons to execute tests', top=False)
status = []
# Return an empty status if no tests have been enabled
if not self._check_enabled_suites(include_multimaster=True) and not self.options.name:
return status
with MultimasterTestDaemon(self):
if self.options.name:
@ -923,7 +914,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
if os.path.isfile(name):
if not name.endswith('.py'):
continue
if name.startswith(os.path.join('tests', 'unit')):
if not name.startswith(os.path.join('tests', 'multimaster')):
continue
results = self.run_suite(os.path.dirname(name),
name,
@ -931,7 +922,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
load_from_name=False)
status.append(results)
continue
if name.startswith(('tests.unit.', 'unit.')):
if not name.startswith(('tests.multimaster.', 'multimaster.')):
continue
results = self.run_suite('', name, suffix='test_*.py', load_from_name=True)
status.append(results)