valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

runtests.py: Accept modified file list from a text file

Browse Source
This commit is contained in:
Erik Johnson 2018-10-12 10:12:37 -05:00
parent 059754c207
commit ed864ceb28
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/support/parser/__init__.py
View File

@ -213,7 +213,10 @@ class SaltTestingParser(optparse.OptionParser):
'unit/integration test module which corresponds to the '
'specified file(s) will be run. For example, a path of '
'salt/modules/git.py would result in unit.modules.test_git '
'and integration.modules.test_git being run.')
'and integration.modules.test_git being run. Absolute paths '
'are assumed to be files containing relative paths, one per '
'line. Providing the paths in a file can help get around '
'shell character limits when the list of files is long.')
)
self.test_selection_group.add_option(
'--filename-map',
@ -337,10 +340,25 @@ class SaltTestingParser(optparse.OptionParser):
'''
ret = set()
for path in paths:
if ',' in path:
ret.update([x.strip() for x in path.split(',')])
for item in [x.strip() for x in path.split(',')]:
if not item:
continue
elif os.path.isabs(item):
try:
with salt.utils.files.fopen(item, 'rb') as fp_:
for line in fp_:
line = salt.utils.stringutils.to_unicode(line.strip())
if os.path.isabs(line):
log.warning(
'Invalid absolute path %s in %s, '
'ignoring', line, item
)
else:
ret.add(path.strip())
ret.add(line)
except (IOError, OSError) as exc:
log.error('Failed to read from %s: %s', item, exc)
else:
ret.add(item)
return ret
@property