cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Disable ansible color output on sanity tests.

Browse source
This commit is contained in:
Matt Clay 2017-03-08 11:45:38 -08:00
parent f689cca0b8
commit cfd313bced
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/runner/lib/ansible_util.py
View file

@ -7,9 +7,10 @@ import os
from lib.util import common_environment from lib.util import common_environment
def ansible_environment(args): def ansible_environment(args, color=True):
""" """
:type args: CommonConfig :type args: CommonConfig
:type color: bool
:rtype: dict[str, str] :rtype: dict[str, str]
""" """
env = common_environment() env = common_environment()
@ -21,7 +22,7 @@ def ansible_environment(args):
path = ansible_path + os.pathsep + path path = ansible_path + os.pathsep + path
ansible = dict( ansible = dict(
ANSIBLE_FORCE_COLOR='%s' % 'true' if args.color else 'false', ANSIBLE_FORCE_COLOR='%s' % 'true' if args.color and color else 'false',
ANSIBLE_DEPRECATION_WARNINGS='false', ANSIBLE_DEPRECATION_WARNINGS='false',
ANSIBLE_CONFIG='/dev/null', ANSIBLE_CONFIG='/dev/null',
ANSIBLE_HOST_KEY_CHECKING='false', ANSIBLE_HOST_KEY_CHECKING='false',

9
test/runner/lib/sanity.py
View file

@ -128,10 +128,7 @@ def command_sanity_code_smell(args, _, script):
test = os.path.splitext(os.path.basename(script))[0] test = os.path.splitext(os.path.basename(script))[0]
cmd = [script] cmd = [script]
env = ansible_environment(args) env = ansible_environment(args, color=False)
# Since the output from scripts end up in other places besides the console, we don't want color here.
env.pop('ANSIBLE_FORCE_COLOR')
try: try:
stdout, stderr = run_command(args, cmd, env=env, capture=True) stdout, stderr = run_command(args, cmd, env=env, capture=True)
@ -155,7 +152,7 @@ def command_sanity_validate_modules(args, targets):
:rtype: SanityResult :rtype: SanityResult
""" """
test = 'validate-modules' test = 'validate-modules'
env = ansible_environment(args) env = ansible_environment(args, color=False)
paths = [deepest_path(i.path, 'lib/ansible/modules/') for i in targets.include_external] paths = [deepest_path(i.path, 'lib/ansible/modules/') for i in targets.include_external]
paths = sorted(set(p for p in paths if p)) paths = sorted(set(p for p in paths if p))
@ -494,7 +491,7 @@ def command_sanity_ansible_doc(args, targets, python_version):
if not modules: if not modules:
return SanitySkipped(test, python_version=python_version) return SanitySkipped(test, python_version=python_version)
env = ansible_environment(args) env = ansible_environment(args, color=False)
cmd = ['ansible-doc'] + modules cmd = ['ansible-doc'] + modules
try: try: