internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use docker pull by default in ansible-test.

Browse Source
This commit is contained in:
Matt Clay
2016-12-14 19:48:30 -08:00
parent 80c559bdef
commit 9b5c782a0b
3 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/runner/test.py
View File

@@ -224,6 +224,8 @@ def parse_args():
action='store_true',
help='collect tests but do not execute them')
add_extra_docker_options(units, integration=False)
compiler = subparsers.add_parser('compile',
parents=[test],
help='compile tests')
@@ -237,6 +239,8 @@ def parse_args():
choices=COMPILE_PYTHON_VERSIONS,
help='python version: %s' % ', '.join(COMPILE_PYTHON_VERSIONS))
add_extra_docker_options(compiler, integration=False)
sanity = subparsers.add_parser('sanity',
parents=[test],
help='sanity tests')
@@ -266,6 +270,8 @@ def parse_args():
choices=SUPPORTED_PYTHON_VERSIONS,
help='python version: %s' % ', '.join(SUPPORTED_PYTHON_VERSIONS))
add_extra_docker_options(sanity, integration=False)
shell = subparsers.add_parser('shell',
parents=[common],
help='open an interactive shell')
@@ -423,12 +429,21 @@ def add_environments(parser, tox_version=False, tox_only=False):
default='prod')
def add_extra_docker_options(parser):
def add_extra_docker_options(parser, integration=True):
"""
:type parser: argparse.ArgumentParser
:type integration: bool
"""
docker = parser.add_argument_group(title='docker arguments')
docker.add_argument('--docker-no-pull',
action='store_false',
dest='docker_pull',
help='do not explicitly pull the latest docker images')
if not integration:
return
docker.add_argument('--docker-util',
metavar='IMAGE',
default='httptester',