Don't display colors on gtest-parallel logs on swarming.

tools-webrtc/gtest-parallel-wrapper.py

 #!/usr/bin/env python
 
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 44 matching lines @@
 def main():
   # Ignore '--'. Options unprocessed by this script will be passed to the test
   # as arguments.
   if '--' in sys.argv:
     del sys.argv[sys.argv.index('--')]
 
   parser = argparse.ArgumentParser()
   parser.add_argument('--isolated-script-test-output', type=str, default=None)
 
   # TODO(ehmaldonado): Implement this flag instead of just "eating" it.
   parser.add_argument('--isolated-script-test-chartjson-output', type=str,

[ehmaldonado_webrtc, 2017/04/28 10:32:39]

Not related to this CL, but I think we don't need to implement it (and possibly
even can't), since it is meant for telemetry tests output.

https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

[kjellander_webrtc, 2017/04/28 10:59:38]

I see, can you update the comment to mention the above then? And remove the
TODO.

                       default=None)
 
+  # TODO(ehmaldonado): Figure out a way to avoid duplicating the flags in
+  # gtest-parallel.
+  parser.add_argument('--gtest_color', type=str, default='yes')

[kjellander_webrtc, 2017/04/28 10:59:38]

What about having 'auto' as the default, since it seems to be the default for
gtest executables?

   parser.add_argument('--output_dir', type=str, default=None)
   parser.add_argument('--timeout', type=int, default=None)
 
   # GTEST_SHARD_INDEX and GTEST_TOTAL_SHARDS must be removed from the
   # environment. Otherwise it will be picked up by the binary, causing a bug
   # where only tests in the first shard are executed.
   test_env = os.environ.copy()
   gtest_shard_index = test_env.pop('GTEST_SHARD_INDEX', '0')
   gtest_total_shards = test_env.pop('GTEST_TOTAL_SHARDS', '1')
 
   webrtc_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
   gtest_parallel_path = os.path.join(
       webrtc_root, 'third_party', 'gtest-parallel', 'gtest-parallel')
 
   options, unprocessed = parser.parse_known_args()
   test_executable = unprocessed[0]
   test_arguments = unprocessed[1:]
 
   gtest_args = [
       test_executable,
       '--shard_count',
       gtest_total_shards,
       '--shard_index',
       gtest_shard_index,
+      '--gtest_color',
+      options.gtest_color,
   ]
 
   # --isolated-script-test-output is used to upload results to the flakiness
   # dashboard. This translation is made because gtest-parallel expects the flag
   # to be called --dump_json_test_results instead.
   if options.isolated_script_test_output:
     gtest_args += [
         '--dump_json_test_results',
         options.isolated_script_test_output,
     ]
@@ skipping 13 matching lines @@
   command = [
       sys.executable,
       gtest_parallel_path,
   ] + gtest_args + ['--'] + test_arguments
 
   print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command)
   sys.stdout.flush()
 
   exit_code = subprocess.call(command, env=test_env, cwd=os.getcwd())
 
-  for test_status in 'passed', 'failed', 'interrupted':
-    logs_dir = os.path.join(options.output_dir, test_status)
-    if not os.path.isdir(logs_dir):
-      continue
-    logs = [os.path.join(logs_dir, log) for log in os.listdir(logs_dir)]
-    log_file = os.path.join(options.output_dir, '%s-tests.log' % test_status)
-    CatFiles(logs, log_file)
-    os.rmdir(logs_dir)
+  if options.output_dir:

[kjellander_webrtc, 2017/04/28 10:59:38]

if this is a bugfix, can you mention it in the CL description as well?

+    for test_status in 'passed', 'failed', 'interrupted':
+      logs_dir = os.path.join(options.output_dir, test_status)
+      if not os.path.isdir(logs_dir):
+        continue
+      logs = [os.path.join(logs_dir, log) for log in os.listdir(logs_dir)]
+      log_file = os.path.join(options.output_dir, '%s-tests.log' % test_status)
+      CatFiles(logs, log_file)
+      os.rmdir(logs_dir)
 
   return exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main())