Upstream: Android Test scripts (phase 3)

build/android/test_package.py

 #!/usr/bin/python
 # Copyright (c) 2011 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 logging
 import re
 import os
 import pexpect
@@ skipping 22 matching lines @@
   """
 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool, dump_debug_info):
     self.adb = adb
     self.device = device
     self.test_suite = os.path.splitext(test_suite)[0]
     self.test_suite_basename = os.path.basename(self.test_suite)
     self.test_suite_dirname = os.path.dirname(self.test_suite)
     self.rebaseline = rebaseline
-    self._performance_test = performance_test
+    self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = CreateTool(tool, self.adb)
     if timeout == 0:
       if self.test_suite_basename == 'page_cycler_tests':
         timeout = 900
       else:
         timeout = 60
     self.timeout = timeout * self.tool.GetTimeoutScale()
     self.dump_debug_info = dump_debug_info
 
   def _BeginGetIOStats(self):
     """Gets I/O statistics before running test.
 
     Return:
       Tuple of (I/O stats object, flag of ready to continue). When encountering
       error, ready-to-continue flag is False, True otherwise. The I/O stats
       object may be None if the test is not performance test.
     """
     initial_io_stats = None
     # Try to get the disk I/O statistics for all performance tests.
-    if self._performance_test and not self.rebaseline:
+    if self.performance_test and not self.rebaseline:
       initial_io_stats = self.adb.GetIoStats()
       # Get rid of the noise introduced by launching Chrome for page cycler.
       if self.test_suite_basename == 'page_cycler_tests':
         try:
           chrome_launch_done_re = re.compile(
               re.escape('Finish waiting for browser launch!'))
           self.adb.WaitForLogMatch(chrome_launch_done_re)
           initial_io_stats = self.adb.GetIoStats()
         except pexpect.TIMEOUT:
           logging.error('Test terminated because Chrome launcher has no'
                         'response after 120 second.')
           return (None, False)
         finally:
           if self.dump_debug_info:
             self.dump_debug_info.TakeScreenshot('_Launch_Chrome_')
     return (initial_io_stats, True)
 
   def _EndGetIOStats(self, initial_io_stats):
     """Gets I/O statistics after running test and calcuate the I/O delta.
 
     Args:
       initial_io_stats: I/O stats object got from _BeginGetIOStats.
 
     Return:
       String for formated diso I/O statistics.
     """
     disk_io = ''
-    if self._performance_test and initial_io_stats:
+    if self.performance_test and initial_io_stats:
       final_io_stats = self.adb.GetIoStats()
       for stat in final_io_stats:
         disk_io += '\n' + PrintPerfResult(stat, stat,
                                           [final_io_stats[stat] -
                                            initial_io_stats[stat]],
                                           stat.split('_')[1], True, False)
       logging.info(disk_io)
     return disk_io
 
   def GetDisabledPrefixes(self):
@@ skipping 52 matching lines @@
     if not self.rebaseline and ready_to_continue:
       ok_tests += self._EndGetIOStats(io_stats_before)
       ret_code = self._GetGTestReturnCode()
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
     return TestResults.FromOkAndFailed(ok_tests, failed_tests)