Refactoring auto-bisect bot

tools/auto_bisect/bisect_perf_regression_test.py

 # Copyright 2014 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 os
 import re
 import shutil
 import sys
 import unittest
 
 SRC = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)
 sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
 
 import bisect_perf_regression
-import bisect_printer
 import bisect_utils
 import mock
 import source_control
 
 
 # Regression confidence: 0%
 CLEAR_NON_REGRESSION = [
     # Mean: 30.223 Std. Dev.: 11.383
     [[16.886], [16.909], [16.99], [17.723], [17.952], [18.118], [19.028],
      [19.552], [21.954], [38.573], [38.839], [38.965], [40.007], [40.572],
@@ skipping 58 matching lines @@
 
 
 def _MockRunTests(*args, **kwargs):
   _, _ = args, kwargs
   return _FakeTestResult(_MockResultsGenerator.next())
 
 
 def _GetBisectPerformanceMetricsInstance(options_dict):
   """Returns an instance of the BisectPerformanceMetrics class."""
   opts = bisect_perf_regression.BisectOptions.FromDict(options_dict)
-  return bisect_perf_regression.BisectPerformanceMetrics(opts)
+  return bisect_perf_regression.BisectPerformanceMetrics(opts, os.getcwd())
 
 
 def _GetExtendedOptions(improvement_dir, fake_first, ignore_confidence=True):
   """Returns the a copy of the default options dict plus some options."""
   result = dict(DEFAULT_OPTIONS)
   result.update({
       'improvement_direction': improvement_dir,
       'debug_fake_first_test_mean': fake_first,
       'debug_ignore_regression_confidence': ignore_confidence})
   return result
@@ skipping 12 matching lines @@
   # Disable rmtree to avoid deleting local trees.
   old_rmtree = shutil.rmtree
   try:
     shutil.rmtree = lambda path, onerror: None
     bisect_instance = _GetBisectPerformanceMetricsInstance(options)
     results = bisect_instance.Run(
         bisect_instance.opts.command, bisect_instance.opts.bad_revision,
         bisect_instance.opts.good_revision, bisect_instance.opts.metric)
 
     if print_results:
-      printer = bisect_printer.BisectPrinter(bisect_instance.opts,
-                                             bisect_instance.depot_registry)
-      printer.FormatAndPrintResults(results)
+      bisect_instance.printer.FormatAndPrintResults(results)
 
     return results
   finally:
     shutil.rmtree = old_rmtree
 
 
 class BisectPerfRegressionTest(unittest.TestCase):
   """Test case for other functions and classes in bisect-perf-regression.py."""
 
   def setUp(self):
@@ skipping 90 matching lines @@
     expects is different in some cases, but we want it to work anyway.
 
     Specifically, only for android:
       After r276628, only android-chrome-shell works.
       Prior to r274857, only android-chromium-testshell works.
       In the range [274857, 276628], both work.
     """
     bisect_options = bisect_perf_regression.BisectOptions()
     bisect_options.output_buildbot_annotations = None
     bisect_instance = bisect_perf_regression.BisectPerformanceMetrics(
-        bisect_options)
+        bisect_options, os.getcwd())
     bisect_instance.opts.target_platform = target_platform
     git_revision = source_control.ResolveToRevision(
         revision, 'chromium', bisect_utils.DEPOT_DEPS_NAME, 100)
     depot = 'chromium'
     command = bisect_instance.GetCompatibleCommand(
         original_command, git_revision, depot)
     self.assertEqual(expected_command, command)
 
   def testGetCompatibleCommand_ChangeToTestShell(self):
     # For revisions <= r274857, only android-chromium-testshell is used.
@@ skipping 145 matching lines @@
     os.chdir = self.old_chdir
     bisect_utils.DEPOT_NAMES = self.old_depot_names
     bisect_utils.DEPOT_DEPS_NAME = self.old_depot_deps_name
 
   def mockChdir(self, new_dir):
     self.cur_dir = new_dir
 
   def testReturnsCorrectResultForChrome(self):
     self.assertEqual(self.registry.GetDepotDir('chromium'), '/mock/src')
 
-  def testReturnsCorrectResultForChromeOS(self):
-    self.assertEqual(self.registry.GetDepotDir('cros'), '/mock/src/tools/cros')
-
   def testUsesDepotSpecToInitializeRegistry(self):
     self.assertEqual(self.registry.GetDepotDir('mock_depot'), '/mock/src/foo')
 
   def testChangedTheDirectory(self):
     self.registry.ChangeToDepotDir('mock_depot')
     self.assertEqual(self.cur_dir, '/mock/src/foo')
 
 
 # The tests below test private functions (W0212).
 # pylint: disable=W0212
@@ skipping 144 matching lines @@
          ], (None, 0)),
     ]
     self._SetupRunGitMock(try_cmd)
     bisect_perf_regression._BuilderTryjob(
         git_revision, bot_name, bisect_job_name, patch)
 
 
 if __name__ == '__main__':
   unittest.main()