Merge "Remove color from puppet output"

This commit is contained in:
Jenkins 2017-06-21 22:21:39 +00:00 committed by Gerrit Code Review
commit 964c41e3ab
2 changed files with 11 additions and 1 deletions

View File

@ -108,7 +108,7 @@ def main(argv=sys.argv):
'w') as f:
f.write(c.get('config', '').encode('utf-8'))
cmd = [PUPPET_CMD, 'apply', '--detailed-exitcodes', fn]
cmd = [PUPPET_CMD, 'apply', '--color', 'false', '--detailed-exitcodes', fn]
# This is the default log destination to print out to the console and
# captured by heat via the subprocess method below.
cmd.insert(-1, '--logdest')

View File

@ -101,6 +101,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -138,6 +140,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -166,6 +170,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -202,6 +208,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -258,6 +266,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',