Android / Telemetry: final cleanup on perf_tests_helper.

build/android/pylib/instrumentation/test_runner.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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import time
 
+
+sys.path.append(os.path.join(sys.path[0],

[frankf, 2013/09/20 02:07:39]

import sys

[bulach, 2013/09/20 08:23:46]

Done.

+                             os.pardir, os.pardir, 'build', 'util', 'lib',
+                             'common'))
+import perf_tests_results_helper
+
 from pylib import android_commands
 from pylib import constants
 from pylib import flag_changer
-from pylib import perf_tests_helper
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.instrumentation import json_perf_parser
 
 import test_result
 
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
 
@@ skipping 250 matching lines @@
       for raw_perf_set in raw_perf_data:
         if raw_perf_set:
           perf_set = raw_perf_set.split(',')
           if len(perf_set) != 3:
             raise Exception('Unexpected number of tokens in perf annotation '
                             'string: ' + raw_perf_set)
 
           # Process the performance data
           result = json_perf_parser.GetAverageRunInfoFromJSONString(json_string,
                                                                     perf_set[0])
-          perf_tests_helper.PrintPerfResult(perf_set[1], perf_set[2],
-                                            [result['average']],
-                                            result['units'])
+          perf_tests_results_helper.PrintPerfResult(perf_set[1], perf_set[2],
+                                                    [result['average']],
+                                                    result['units'])
 
   def _SetupIndividualTestTimeoutScale(self, test):
     timeout_scale = self._GetIndividualTestTimeoutScale(test)
     valgrind_tools.SetChromeTimeoutScale(self.adb, timeout_scale)
 
   def _GetIndividualTestTimeoutScale(self, test):
     """Returns the timeout scale for the given |test|."""
     annotations = self.test_pkg.GetTestAnnotations(test)
     timeout_scale = 1
     if 'TimeoutScale' in annotations:
@@ skipping 67 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)