Add dependency_manager initialization to binary_manager

tools/telemetry/telemetry/testing/run_tests.py

 # Copyright 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 sys
 
 from telemetry.core import util
 from telemetry import decorators
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_finder_exceptions
 from telemetry.internal.browser import browser_options
 from telemetry.internal.platform import device_finder
+from telemetry.internal.util import binary_manager
 from telemetry.internal.util import command_line
 from telemetry.testing import browser_test_case
 from telemetry.testing import options_for_unittests
 
 util.AddDirToPythonPath(util.GetTelemetryThirdPartyDir(), 'typ')
 
 import typ
 
 
 class RunTestsCommand(command_line.OptparseCommand):
@@ skipping 16 matching lines @@
   def AddCommandLineArgs(cls, parser, _):
     parser.add_option('--repeat-count', type='int', default=1,
                       help='Repeats each a provided number of times.')
     parser.add_option('-d', '--also-run-disabled-tests',
                       dest='run_disabled_tests',
                       action='store_true', default=False,
                       help='Ignore @Disabled and @Enabled restrictions.')
     parser.add_option('--exact-test-filter', action='store_true', default=False,
                       help='Treat test filter as exact matches (default is '
                            'substring matches).')
+    parser.add_option('--client-config', dest='client_config', default=None)
 
     typ.ArgumentParser.add_option_group(parser,
                                         "Options for running the tests",
                                         running=True,
                                         skip=['-d', '-v', '--verbose'])
     typ.ArgumentParser.add_option_group(parser,
                                         "Options for reporting the results",
                                         reporting=True)
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args, _):
     # We retry failures by default unless we're running a list of tests
     # explicitly.
     if not args.retry_limit and not args.positional_args:
       args.retry_limit = 3
 
+    binary_manager.InitDependencyManager(args.client_config)

[nednguyen, 2015/08/13 22:20:45]

I think it's better to put this in the Run(self, args) method below. Putting
this in ProcessCommandLineArgs seems a bit off..

[aiolos (Not reviewing), 2015/08/13 22:28:32]

We can only do this if we move the check for possible browser to Run as well.
The call to browser_finder.FindBrowser will raise an exception if we don't
initialize the dependency_manager first.

+
     try:
       possible_browser = browser_finder.FindBrowser(args)
     except browser_finder_exceptions.BrowserFinderException, ex:
       parser.error(ex)
 
     if not possible_browser:
       parser.error('No browser found of type %s. Cannot run tests.\n'
                    'Re-run with --browser=list to see '
                    'available browser types.' % args.browser_type)
 
@@ skipping 86 matching lines @@
 
 def _MatchesSelectedTest(name, selected_tests, selected_tests_are_exact):
   if not selected_tests:
     return False
   if selected_tests_are_exact:
     return any(name in selected_tests)
   else:
     return any(test in name for test in selected_tests)
 
 
 def _SetUpProcess(child, context): # pylint: disable=W0613

[nednguyen, 2015/08/13 22:20:45]

Nit: add comment explaining why we need to init the dependency manager again
here.

[aiolos (Not reviewing), 2015/08/13 22:28:32]

Acknowledged.

+  if binary_manager.NeedsInit():
+    binary_manager.InitDependencyManager(context.client_config)
+
   args = context
   if args.device and args.device == 'android':
     android_devices = device_finder.GetDevicesMatchingOptions(args)
     args.device = android_devices[child.worker_num-1].guid
   options_for_unittests.Push(args)
 
 
 def _TearDownProcess(child, context): # pylint: disable=W0613
   browser_test_case.teardown_browser()
   options_for_unittests.Pop()
 
 
 if __name__ == '__main__':
   ret_code = RunTestsCommand.main()
   sys.exit(ret_code)