Android: Fix invocations of TestResult.LogFull

build/android/pylib/test_result.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.
 
 
 import json
 import logging
 import os
 import time
 import traceback
@@ skipping 159 matching lines @@
       content = {'test_group': test_group,
                  'ok': [t.name for t in self.ok],
                  'failed': [t.name for t in self.failed],
                  'crashed': [t.name for t in self.failed],
                  'unknown': [t.name for t in self.unknown],}
       with open(os.path.join(log_file_path, 'results.json'), 'a') as json_file:
         print >> json_file, json.dumps(content)
 
     # Summarize in the test output.
     summary = ['Summary:\n']
-    summary += ['TESTS_TO_RUN=%d\n' % (len(tests_to_run))]
+    if tests_to_run:

[Isaac (away), 2012/11/07 19:32:37]

I think we can remove these checks now that we are passing the actual list of
tests.

[nilesh, 2012/11/07 19:35:27]

Actual list of tests is not passed from run_instrumentation_tests. We pass an
empty list there and this output is misleading. Also when a gtest_filter is
specified we do not have the list of unittests to run.

+      summary += ['TESTS_TO_RUN=%d\n' % (len(tests_to_run))]
     num_tests_ran = (len(self.ok) + len(self.failed) +
                      len(self.crashed) + len(self.unknown))
     tests_passed = [t.name for t in self.ok]
     tests_failed = [t.name for t in self.failed]
     tests_crashed = [t.name for t in self.crashed]
     tests_unknown = [t.name for t in self.unknown]
     summary += ['RAN=%d\n' % (num_tests_ran),
                 'PASSED=%d\n' % len(tests_passed),
                 'FAILED=%d %s\n' % (len(tests_failed), tests_failed),
                 'CRASHED=%d %s\n' % (len(tests_crashed), tests_crashed),
                 'UNKNOWN=%d %s\n' % (len(tests_unknown), tests_unknown)]
-    if num_tests_ran != len(tests_to_run):
+    if tests_to_run and num_tests_ran != len(tests_to_run):
       # Add the list of tests we failed to run.
       tests_failed_to_run = list(set(tests_to_run) - set(tests_passed) -
                             set(tests_failed) - set(tests_crashed) -
                             set(tests_unknown))
       summary += ['FAILED_TO_RUN=%d %s\n' % (len(tests_failed_to_run),
                                              tests_failed_to_run)]
     summary_string = ''.join(summary)
     logging.critical(summary_string)
     return summary_string
 
   def PrintAnnotation(self):
     """Print buildbot annotations for test results."""
     if self.failed or self.crashed or self.overall_fail or self.timed_out:
       buildbot_report.PrintError()
     else:
       print 'Step success!'  # No annotation needed