Add new tests to presubmit, fix errors

run_unittests

 #!/usr/bin/env python
 # 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.
 
 """Runs all unit tests under this base directory."""
 
 import os
 import subprocess
 import sys
 import unittest
 
 
 BUILDBOT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 
-GO_TESTS = [
+GO_DIRS = [
   '.',
   'perf',
   'monitoring',
   'golden',
 ]
 
 GO_TEST_FAILED = (
 '''======================================================================
 Go test failed: %s
+CWD: %s
 ----------------------------------------------------------------------
 %s
 ----------------------------------------------------------------------
 ''')
 
 NO_CRAWL_DIRS = [
   '.git',
   '.svn',
   'autoroll_git',
   'common',
   'git_poller_skia.git',
   'third_party',
 ]
 
 
 def FilterDirectory(dirpath, filenames):
   """ Determine whether to look for tests in the given directory.
 
   dirpath: string; path of the directory in question.
   filenames: list of strings; the files in the directory.
   """
   if not dirpath or not filenames:
     return False
   for no_crawl_dir in NO_CRAWL_DIRS:
     if no_crawl_dir in dirpath:
       return False
   return True
 
 
-def TestGo(testname):
-  # TODO(borenet): Switch to 'make test' once we're sure the karma-based tests
-  # will run in headless mode.
-  p = subprocess.Popen(['make', 'testgo'], cwd=testname,
+def RunGoTest(cmd, cwd):
+  p = subprocess.Popen(cmd, cwd=cwd,
                        stderr=subprocess.STDOUT,
                        stdout=subprocess.PIPE)
   output = p.communicate()[0]
   if p.returncode != 0:
-    return GO_TEST_FAILED % (testname, output)
-  return None
+    return [GO_TEST_FAILED % (' '.join(cmd), cwd, output)]
+  return []
 
 
-def GoImports():
+def GoTests(cwd):
+  # TODO(borenet): Switch to 'make test' once we're sure the karma-based tests
+  # will run in headless mode.
+  return RunGoTest(['make', 'testgo'], cwd)
+
+
+def GoVet(cwd):
+  # We need to actually point to go packages. Find any directories in cwd
+  # which contain .go files and run "go vet" on them.

[jcgregorio, 2014/12/05 15:57:33]

Doesn't this work?

$ go vet ./... 

[borenet, 2014/12/05 16:07:00]

It sure does!

+  modules = []
+  go_path = os.path.join(cwd, 'go')
+  for item in os.listdir(go_path):
+    item_path = os.path.join(go_path, item)
+    if os.path.isdir(item_path):
+      for f in os.listdir(item_path):
+        file_path = os.path.join(item_path, f)
+        if os.path.isfile(file_path) and f.endswith('.go'):
+          modules.append(item_path)
+          break
+
+  errors = []
+  for m in modules:
+    errors.extend(RunGoTest(['go', 'vet'], m))
+  return errors
+
+
+def GoImports(cwd):
+  cmd = ['goimports', '-l', 'go']
   try:
-    diff_files = subprocess.check_output(['goimports', '-l', '.'],
+    diff_files = subprocess.check_output(cmd, cwd=cwd,
                                          stderr=subprocess.PIPE).splitlines()
   except subprocess.CalledProcessError:
-    return ('goimports failed to run! Is it installed? You may need to run: \n'
-            'go get http://code.google.com/p/go.tools/cmd/goimports')
+    return [GO_TEST_FAILED % (
+        ' '.join(cmd), cwd,
+        ('goimports failed to run! Is it installed? You may need to run:\n'
+         'go get http://code.google.com/p/go.tools/cmd/goimports'))]
 
   if len(diff_files) > 0:
-    return ('goimports found diffs in the following files: %s' %
-            ', '.join(diff_files))
-  return None
+    return [GO_TEST_FAILED % (
+        ' '.join(cmd), cwd,
+        ('goimports found diffs in the following files: %s' %
+         ', '.join(diff_files)))]
+  return []
 
 
 if __name__ == '__main__':
   print 'Searching for tests.'
   tests_to_run = []
 
   for (dirpath, dirnames, filenames) in os.walk(BUILDBOT_PATH, topdown=True):
     dirnames[:] = [d for d in dirnames if not d in NO_CRAWL_DIRS]
     test_modules = [os.path.join(dirpath, filename) for filename in filenames
                     if filename.endswith('_test.py')]
     if not test_modules:
       continue
     tests_to_run.extend(test_modules)
 
-  builtin_tests = [GoImports]
+  go_tests = [GoTests,
+              GoImports,
+              GoVet]
 
-  num_tests = len(tests_to_run) + len(GO_TESTS) + len(builtin_tests)
+  num_tests = len(tests_to_run) + len(GO_DIRS) * len(go_tests)
   print 'Found %d tests.' % num_tests
   errors = []
   for test in tests_to_run:
     proc = subprocess.Popen(['python', test], stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     if proc.wait() != 0:
       errors.append(proc.communicate()[0])
 
-  for go_test in GO_TESTS:
-    error = TestGo(go_test)
-    if error:
-      errors.append(error)
-
-  for builtin_test in builtin_tests:
-    error = builtin_test()
-    if error:
-      errors.append(error)
+  for go_dir in GO_DIRS:
+    for test in go_tests:
+      errors.extend(test(go_dir))
 
   if errors:
     for error in errors:
       print error
-    print 'Failed %d of %d.' % (len(errors), num_tests)
     sys.exit(1)
   else:
     print 'All tests succeeded.'