Add additional support code in ansible-test.

This commit is contained in:
Matt Clay 2018-02-14 11:15:01 -08:00
parent 09d939fb00
commit 6a4f6a6490
2 changed files with 12 additions and 3 deletions

View file

@ -94,19 +94,23 @@ def docker_get(args, container_id, src, dst):
options=['-i'], stdout=dst_fd, capture=True)
def docker_run(args, image, options):
def docker_run(args, image, options, cmd=None):
"""
:type args: EnvironmentConfig
:type image: str
:type options: list[str] | None
:type cmd: list[str] | None
:rtype: str | None, str | None
"""
if not options:
options = []
if not cmd:
cmd = []
for _ in range(1, 3):
try:
return docker_command(args, ['run'] + options + [image], capture=True)
return docker_command(args, ['run'] + options + [image] + cmd, capture=True)
except SubprocessError as ex:
display.error(ex)
display.warning('Failed to run docker image "%s". Waiting a few seconds before trying again.' % image)

View file

@ -32,13 +32,15 @@ from lib.util import (
class HttpClient(object):
"""Make HTTP requests via curl."""
def __init__(self, args, always=False):
def __init__(self, args, always=False, insecure=False):
"""
:type args: CommonConfig
:type always: bool
:type insecure: bool
"""
self.args = args
self.always = always
self.insecure = insecure
def get(self, url):
"""
@ -73,6 +75,9 @@ class HttpClient(object):
"""
cmd = ['curl', '-s', '-S', '-i', '-X', method]
if self.insecure:
cmd += ['--insecure']
if headers is None:
headers = {}