wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix docker error handling for cs/vcenter tests.

Browse source
This commit is contained in:
Matt Clay 2017-09-15 16:08:25 -07:00
parent 61dd5517c3
commit 397918435b
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/runner/lib/cloud/cs.py
View file

@ -66,12 +66,18 @@ class CsCloudProvider(CloudProvider):
if os.path.isfile(self.config_static_path):
return
docker = find_executable('docker')
docker = find_executable('docker', required=False)
if docker:
return
super(CsCloudProvider, self).filter(targets, exclude)
skip = 'cloud/%s/' % self.platform
skipped = [target.name for target in targets if skip in target.aliases]
if skipped:
exclude.append(skip)
display.warning('Excluding tests marked "%s" which require the "docker" command or config (see "%s"): %s'
% (skip.rstrip('/'), self.config_template_path, ', '.join(skipped)))
def setup(self):
"""Setup the cloud resource before delegation and register a cleanup callback."""

13
test/runner/lib/cloud/vcenter.py
View file

@ -47,15 +47,18 @@ class VcenterProvider(CloudProvider):
:type targets: tuple[TestTarget]
:type exclude: list[str]
"""
if os.path.isfile(self.config_static_path):
return
docker = find_executable('docker')
docker = find_executable('docker', required=False)
if docker:
return
super(VcenterProvider, self).filter(targets, exclude)
skip = 'cloud/%s/' % self.platform
skipped = [target.name for target in targets if skip in target.aliases]
if skipped:
exclude.append(skip)
display.warning('Excluding tests marked "%s" which require the "docker" command: %s'
% (skip.rstrip('/'), ', '.join(skipped)))
def setup(self):
"""Setup the cloud resource before delegation and register a cleanup callback."""