Add RunUnitTests() and RunUnitTestsInDirectory() canned checks.

presubmit_canned_checks.py

 # Copyright (c) 2010 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."""
 
 
 ### Description checks
 
 def CheckChangeHasTestField(input_api, output_api):
@@ skipping 392 matching lines @@
       connection.close()
       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:
     pass
   return []
 
 
+def RunUnitTestsInDirectory(
+    input_api, output_api, directory, whitelist=None, blacklist=None,
+    verbose=False):
+  """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):
+    return any(True for i in filters if input_api.re.match(i, filename))
+
+  for filename in input_api.os_listdir(test_path):
+    fullpath = input_api.os_path.join(test_path, filename)
+    if not input_api.os_path.isfile(fullpath):
+      continue
+    if whitelist and not check(filename, whitelist):
+      continue
+    if blacklist and check(filename, blacklist):
+      continue
+    unit_tests.append(input_api.os_path.join(directory, filename))
+  return RunUnitTests(input_api, output_api, unit_tests, verbose)
+
+
+def RunUnitTests(input_api, output_api, unit_tests, verbose=False):
+  """Runs all unit tests in a directory.
+
+  On Windows, if the unit tests ends with ".py", it will automatically prepend
+  sys.executable.

[Dirk Pranke, 2011/03/30 20:18:58]

I read "it" here as Windows (or Python), but you mean "it" == this method. Can
you change "it will" to "we"?

+  """
+  # 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
+
+  if verbose:
+    pipe = None
+  else:
+    pipe = input_api.subprocess.PIPE
+
+  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 verbose:
+      print('Running %s' % unit_test)
+    try:
+      proc = input_api.subprocess.Popen(
+          cmd, cwd=input_api.PresubmitLocalPath(), stdout=pipe, stderr=pipe)
+      out = '\n'.join(filter(None, proc.communicate()))
+      if proc.returncode:
+        results.append(message_type(
+          '%s failed with return code %d\n%s' % (
+            unit_test, proc.returncode, out)))
+    except (OSError, input_api.subprocess.CalledProcessError):
+      results.append(message_type('%s failed' % unit_test))
+  return results
+
+
 def RunPythonUnitTests(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.
   """

[Dirk Pranke, 2011/03/30 20:18:58]

Can we make this just call RunUnitTests()? Do we need to duplicate the code?

[M-A Ruel, 2011/03/31 00:11:06]

The code is really different. And I'll simply remove all usage of this function
and will delete in a few weeks.

   # 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.PresubmitNotifyResult
   outputs = []
   for unit_test in unit_tests:
     # Run the unit tests out of process. This is because some unit tests
     # stub out base libraries and don't clean up their mess. It's too easy to
     # get subtle bugs.
@@ skipping 43 matching lines @@
   # We cannot use AffectedFiles here because we want to test every python
   # file on each single python change. It's because a change in a python file
   # can break another unmodified file.
   # Use code similar to InputApi.FilterSourceFile()
   def Find(filepath, filters):
     for item in filters:
       if input_api.re.match(item, filepath):
         return True
     return False
 
-  import os
   files = []
   path_len = len(input_api.PresubmitLocalPath())
-  for dirpath, dirnames, filenames in os.walk(input_api.PresubmitLocalPath()):
+  for dirpath, dirnames, filenames in input_api.os_walk(
+      input_api.PresubmitLocalPath()):
     # Passes dirnames in black list to speed up search.
     for item in dirnames[:]:
       filepath = input_api.os_path.join(dirpath, item)[path_len + 1:]
       if Find(filepath, black_list):
         dirnames.remove(item)
     for item in filenames:
       filepath = input_api.os_path.join(dirpath, item)[path_len + 1:]
       if Find(filepath, white_list) and not Find(filepath, black_list):
         files.append(filepath)
   return files
@@ skipping 336 matching lines @@
       input_api, output_api, source_file_filter=text_files))
   results.extend(input_api.canned_checks.CheckSvnForCommonMimeTypes(
       input_api, output_api))
   results.extend(input_api.canned_checks.CheckLicense(
       input_api, output_api, license_header, source_file_filter=sources))
   results.extend(_CheckConstNSObject(
       input_api, output_api, source_file_filter=sources))
   results.extend(_CheckSingletonInHeaders(
       input_api, output_api, source_file_filter=sources))
   return results