Adding custom environment variable support to presubmit_canned_checks.GetUnitTestsInDirectory

presubmit_canned_checks.py

 # Copyright (c) 2012 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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 import os as _os
 _HERE = _os.path.dirname(_os.path.abspath(__file__))
 
 
@@ skipping 478 matching lines @@
       if input_api.re.match(closed, status):
         long_text = status + '\n' + url
         return [output_api.PresubmitError('The tree is closed.',
                                           long_text=long_text)]
   except IOError as e:
     return [output_api.PresubmitError('Error fetching tree status.',
                                       long_text=str(e))]
   return []
 
 def GetUnitTestsInDirectory(
-    input_api, output_api, directory, whitelist=None, blacklist=None):
+    input_api, output_api, directory, whitelist=None, blacklist=None, env=None):
   """Lists all files in a directory and runs them. Doesn't recurse.
 
   It's mainly a wrapper for RunUnitTests. Use whitelist and blacklist to filter
   tests accordingly.
   """
   unit_tests = []
   test_path = input_api.os_path.abspath(
       input_api.os_path.join(input_api.PresubmitLocalPath(), directory))
 
   def check(filename, filters):
@@ skipping 11 matching lines @@
       continue
     unit_tests.append(input_api.os_path.join(directory, filename))
     to_run += 1
   input_api.logging.debug('Found %d files, running %d' % (found, to_run))
   if not to_run:
     return [
         output_api.PresubmitPromptWarning(
           'Out of %d files, found none that matched w=%r, b=%r in directory %s'
           % (found, whitelist, blacklist, directory))
     ]
-  return GetUnitTests(input_api, output_api, unit_tests)
+  return GetUnitTests(input_api, output_api, unit_tests, env)
 
 
-def GetUnitTests(input_api, output_api, unit_tests):
+def GetUnitTests(input_api, output_api, unit_tests, env=None):
   """Runs all unit tests in a directory.
 
   On Windows, sys.executable is used for unit tests ending with ".py".
   """
   # We don't want to hinder users from uploading incomplete patches.
   if input_api.is_committing:
     message_type = output_api.PresubmitError
   else:
     message_type = output_api.PresubmitPromptWarning
 
   results = []
   for unit_test in unit_tests:
     cmd = []
     if input_api.platform == 'win32' and unit_test.endswith('.py'):
       # Windows needs some help.
       cmd = [input_api.python_executable]
     cmd.append(unit_test)
     if input_api.verbose:
       cmd.append('--verbose')
     results.append(input_api.Command(
         name=unit_test,
         cmd=cmd,
-        kwargs={'cwd': input_api.PresubmitLocalPath()},
+        kwargs={'cwd': input_api.PresubmitLocalPath(), 'env': env},

[ghost stip (do not use), 2014/04/24 20:49:03]

what is env if you don't pass it in as a kwarg? do you want to do env = env |
os.environ.copy()

[smut, 2014/04/24 20:55:40]

I don't want to pass os.environ.copy() by default because before I made this
change, env was not being passed to this method at all. Making os.environ.copy()
default will make every place where GetUnitTests is being used suddenly have a
potentially unexpected environment when running tests.

I've uploaded a new patch that prevents any impact on pre-existing presubmits.

         message=message_type))
   return results
 
 
 def GetPythonUnitTests(input_api, output_api, unit_tests):
   """Run the unit tests out of process, capture the output and use the result
   code to determine success.
 
   DEPRECATED.
   """
@@ skipping 493 matching lines @@
 def CheckPatchFormatted(input_api, output_api):
   import git_cl
   cmd = ['cl', 'format', '--dry-run', input_api.PresubmitLocalPath()]
   code, _ = git_cl.RunGitWithCode(cmd, suppress_stderr=True)
   if code == 2:
     return [output_api.PresubmitPromptWarning(
       'Your patch is not formatted, please run git cl format.')]
   # As this is just a warning, ignore all other errors if the user
   # happens to have a broken clang-format, doesn't use git, etc etc.
   return []