Fix ansible-test handling of integration dir.

pull/28836/merge
Matt Clay 7 years ago
parent dca887a6dc
commit bda0f6e241

@ -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,6 +399,7 @@ class PathMapper(object):
} }
if path.startswith('test/integration/'): if path.startswith('test/integration/'):
if dirname == 'test/integration':
if self.prefixes.get(name) == 'network' and ext == '.yaml': if self.prefixes.get(name) == 'network' and ext == '.yaml':
return minimal # network integration test playbooks are not used by ansible-test return minimal # network integration test playbooks are not used by ansible-test
@ -409,7 +411,7 @@ class PathMapper(object):
'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,
} }

Loading…
Cancel
Save