Makes mopy turn off gtest coloring

mojo/tools/mopy/gtest.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import Queue
 import re
 import subprocess
 import sys
 import threading
 import time
 
 from mopy.config import Config
 from mopy.paths import Paths
 
 sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),
                              '..', '..', '..', 'testing'))
 import xvfb
 
 
 # The DISPLAY ID number used for xvfb, incremented with each use.
 XVFB_DISPLAY_ID = 9
 
 
-def set_color():
-  '''Run gtests with color on TTY, unless its environment variable is set.'''
-  if sys.stdout.isatty() and 'GTEST_COLOR' not in os.environ:
-    logging.getLogger().debug('Setting GTEST_COLOR=yes')
-    os.environ['GTEST_COLOR'] = 'yes'
-
-
 def run_apptest(config, shell, args, apptest, isolate):
   '''Run the apptest; optionally isolating fixtures across shell invocations.
 
   Returns the list of test fixtures run and the list of failed test fixtures.
   TODO(msw): Also return the list of DISABLED test fixtures.
 
   Args:
     config: The mopy.config.Config for the build.
     shell: The mopy.android.AndroidShell, if Android is the target platform.
     args: The arguments for the shell or apptest.
@@ skipping 104 matching lines @@
 def _build_command_line(config, args, apptest):
   '''Build the apptest command line. This value isn't executed on Android.'''
   not_list_tests = not '--gtest_list_tests' in args
   data_dir = ['--use-temporary-user-data-dir'] if not_list_tests else []
   return Paths(config).mojo_runner + data_dir + args + [apptest]
 
 
 def _run_test_with_xvfb(config, shell, args, apptest):
   '''Run the test with xvfb; return the output or raise an exception.'''
   env = os.environ.copy()
+  # Make sure gtest doesn't try to add color to the output. Color is done via
+  # escape sequences which confuses the code that searches the gtest output.
+  env['GTEST_COLOR'] = 'no'
   if (config.target_os != Config.OS_LINUX or '--gtest_list_tests' in args
       or not xvfb.should_start_xvfb(env)):
     return _run_test_with_timeout(config, shell, args, apptest, env)
 
   try:
     # Simply prepending xvfb.py to the command line precludes direct control of
     # test subprocesses, and prevents easily getting output when tests timeout.
     xvfb_proc = None
     openbox_proc = None
     global XVFB_DISPLAY_ID
@@ skipping 66 matching lines @@
       (r, w) = os.pipe()
       with os.fdopen(r, 'r') as rf:
         with os.fdopen(w, 'w') as wf:
           arguments = args + [apptest]
           shell.StartActivity('MojoShellActivity', arguments, wf, wf.close)
           output = rf.read()
   except Exception as e:
     output += (e.output + '\n') if hasattr(e, 'output') else ''
     exception += str(e)
   result.put((output, exception))