[Android] Allow instrumentation test skipping.

build/android/pylib/base/base_test_result.py

 # Copyright (c) 2013 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.
 
 """Module containing base test results classes."""
 
 class ResultType(object):
   """Class enumerating test types."""
   PASS = 'PASS'
+  SKIP = 'SKIP'
   FAIL = 'FAIL'
   CRASH = 'CRASH'
   TIMEOUT = 'TIMEOUT'
   UNKNOWN = 'UNKNOWN'
 
   @staticmethod
   def GetTypes():
     """Get a list of all test types."""
-    return [ResultType.PASS, ResultType.FAIL, ResultType.CRASH,
-            ResultType.TIMEOUT, ResultType.UNKNOWN]
+    return [ResultType.PASS, ResultType.SKIP, ResultType.FAIL,
+            ResultType.CRASH, ResultType.TIMEOUT, ResultType.UNKNOWN]
 
 
 class BaseTestResult(object):
   """Base class for a single test result."""
 
   def __init__(self, name, test_type, log=''):
     """Construct a BaseTestResult.
 
     Args:
       name: Name of the test which defines uniqueness.
@@ skipping 60 matching lines @@
 
   def GetGtestForm(self):
     """Get the gtest string representation of this object."""
     s = []
     plural = lambda n, s, p: '%d %s' % (n, p if n != 1 else s)
     tests = lambda n: plural(n, 'test', 'tests')
 
     s.append('[==========] %s ran.' % (tests(len(self.GetAll()))))
     s.append('[  PASSED  ] %s.' % (tests(len(self.GetPass()))))
 
-    not_passed = self.GetNotPass()
-    if len(not_passed) > 0:
-      s.append('[  FAILED  ] %s, listed below:' % tests(len(self.GetNotPass())))
-      for t in self.GetFail():
+    skipped = self.GetSkip()
+    if skipped:
+      s.append('[  SKIPPED ] Skipped %s, listed below:' % tests(len(skipped)))
+      for t in sorted(skipped):
+        s.append('[  SKIPPED ] %s' % str(t))
+
+    all_failures = self.GetFail().union(self.GetCrash(), self.GetTimeout(),
+        self.GetUnknown())
+    if all_failures:
+      s.append('[  FAILED  ] %s, listed below:' % tests(len(all_failures)))
+      for t in sorted(self.GetFail()):
         s.append('[  FAILED  ] %s' % str(t))
-      for t in self.GetCrash():
+      for t in sorted(self.GetCrash()):
         s.append('[  FAILED  ] %s (CRASHED)' % str(t))
-      for t in self.GetTimeout():
+      for t in sorted(self.GetTimeout()):
         s.append('[  FAILED  ] %s (TIMEOUT)' % str(t))
-      for t in self.GetUnknown():
+      for t in sorted(self.GetUnknown()):
         s.append('[  FAILED  ] %s (UNKNOWN)' % str(t))
       s.append('')
-      s.append(plural(len(not_passed), 'FAILED TEST', 'FAILED TESTS'))
+      s.append(plural(len(all_failures), 'FAILED TEST', 'FAILED TESTS'))
     return '\n'.join(s)
 
   def GetShortForm(self):
     """Get the short string representation of this object."""
     s = []
     s.append('ALL: %d' % len(self._results))
     for test_type in ResultType.GetTypes():
       s.append('%s: %d' % (test_type, len(self._GetType(test_type))))
     return ''.join([x.ljust(15) for x in s])
 
@@ skipping 33 matching lines @@
     return self._results.copy()
 
   def _GetType(self, test_type):
     """Get the set of test results with the given test type."""
     return set(t for t in self._results if t.GetType() == test_type)
 
   def GetPass(self):
     """Get the set of all passed test results."""
     return self._GetType(ResultType.PASS)
 
+  def GetSkip(self):
+    """Get the set of all skipped test results."""
+    return self._GetType(ResultType.SKIP)
+
   def GetFail(self):
     """Get the set of all failed test results."""
     return self._GetType(ResultType.FAIL)
 
   def GetCrash(self):
     """Get the set of all crashed test results."""
     return self._GetType(ResultType.CRASH)
 
   def GetTimeout(self):
     """Get the set of all timed out test results."""
     return self._GetType(ResultType.TIMEOUT)
 
   def GetUnknown(self):
     """Get the set of all unknown test results."""
     return self._GetType(ResultType.UNKNOWN)
 
   def GetNotPass(self):
     """Get the set of all non-passed test results."""
     return self.GetAll() - self.GetPass()
 
   def DidRunPass(self):
     """Return whether the test run was successful."""
-    return not self.GetNotPass()
+    return not (self.GetNotPass() - self.GetSkip())
+