ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-08 02:01:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ansible-test handling of integration dir.

Browse source
This commit is contained in:
Matt Clay 2017-08-30 10:40:14 -07:00
parent dca887a6dc
commit bda0f6e241
1 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
test/runner/lib/classification.py
View file

@ -216,6 +216,7 @@ class PathMapper(object):
:type path: str :type path: str
:rtype: dict[str, str] | None :rtype: dict[str, str] | None
""" """
dirname = os.path.dirname(path)
filename = os.path.basename(path) filename = os.path.basename(path)
name, ext = os.path.splitext(filename) name, ext = os.path.splitext(filename)
@ -398,29 +399,30 @@ class PathMapper(object):
} }
if path.startswith('test/integration/'): if path.startswith('test/integration/'):
if self.prefixes.get(name) == 'network' and ext == '.yaml': if dirname == 'test/integration':
return minimal # network integration test playbooks are not used by ansible-test if self.prefixes.get(name) == 'network' and ext == '.yaml':
return minimal # network integration test playbooks are not used by ansible-test
if filename == 'platform_agnostic.yaml': if filename == 'platform_agnostic.yaml':
return minimal # network integration test playbook not used by ansible-test return minimal # network integration test playbook not used by ansible-test
for command in ( for command in (
'integration', 'integration',
'windows-integration', 'windows-integration',
'network-integration', 'network-integration',
): ):
if name == command: if name == command and ext == '.cfg':
return { return {
command: self.integration_all_target, command: self.integration_all_target,
} }
if name.startswith('cloud-config-'): if name.startswith('cloud-config-'):
cloud_target = 'cloud/%s/' % name.split('-')[2].split('.')[0] cloud_target = 'cloud/%s/' % name.split('-')[2].split('.')[0]
if cloud_target in self.integration_targets_by_alias: if cloud_target in self.integration_targets_by_alias:
return { return {
'integration': cloud_target, 'integration': cloud_target,
} }
return { return {
'integration': self.integration_all_target, 'integration': self.integration_all_target,