cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow for test groups with double digits (#58532)

Browse source
This commit is contained in:
Sam Doran 2019-06-28 19:24:15 -04:00 committed by Matt Clay
parent ab6a9ef130
commit 8cfd0ba039
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/runner/lib/sanity/integration_aliases.py
View file

@ -100,7 +100,7 @@ class IntegrationAliasesTest(SanitySingleVersion):
:rtype: dict[str, set[int]] :rtype: dict[str, set[int]]
""" """
if not self._shippable_test_groups: if not self._shippable_test_groups:
matches = [re.search(r'^[ #]+- env: T=(?P<group>[^/]+)/(?P<params>.+)/(?P<number>[1-9])$', line) for line in self.shippable_yml_lines] matches = [re.search(r'^[ #]+- env: T=(?P<group>[^/]+)/(?P<params>.+)/(?P<number>[1-9][0-9]?)$', line) for line in self.shippable_yml_lines]
entries = [(match.group('group'), int(match.group('number'))) for match in matches if match] entries = [(match.group('group'), int(match.group('number'))) for match in matches if match]
for key, value in entries: for key, value in entries:
@ -126,7 +126,9 @@ class IntegrationAliasesTest(SanitySingleVersion):
if max(group_numbers) != len(group_numbers): if max(group_numbers) != len(group_numbers):
display.warning('Max test group "%s" in shippable.yml is %d instead of %d.' % (name, max(group_numbers), len(group_numbers)), unique=True) display.warning('Max test group "%s" in shippable.yml is %d instead of %d.' % (name, max(group_numbers), len(group_numbers)), unique=True)
if len(group_numbers) > 1: if max(group_numbers) > 9:
alias = 'shippable/%s/group(%s)/' % (name, '|'.join(str(i) for i in range(min(group_numbers), max(group_numbers) + 1)))
elif len(group_numbers) > 1:
alias = 'shippable/%s/group[%d-%d]/' % (name, min(group_numbers), max(group_numbers)) alias = 'shippable/%s/group[%d-%d]/' % (name, min(group_numbers), max(group_numbers))
else: else:
alias = 'shippable/%s/group%d/' % (name, min(group_numbers)) alias = 'shippable/%s/group%d/' % (name, min(group_numbers))