[Telemetry] Move discover to common/py_utils

telemetry/telemetry/benchmark_runner.py

 # Copyright 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.
 
 """Parses the command line, discovers the appropriate benchmarks, and runs them.
 
 Handles benchmark configuration, but all the logic for
 actually running the benchmark is in Benchmark and PageRunner."""
 
 import argparse
 import json
 import logging
 import os
 import sys
 
 from telemetry import benchmark
-from telemetry.core import discover
 from telemetry import decorators
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_options
 from telemetry.internal.util import binary_manager
 from telemetry.internal.util import command_line
 from telemetry.internal.util import ps_util
 from telemetry.util import matching
 from telemetry.util import bot_utils
 
+from py_utils import discover
 
 # Right now, we only have one of each of our power perf bots. This means that
 # all eligible Telemetry benchmarks are run unsharded, which results in very
 # long (12h) cycle times. We'd like to reduce the number of tests that we run
 # on each bot drastically until we get more of the same hardware to shard tests
 # with, but we can't do so until we've verified that the hardware configuration
 # is a viable one for Chrome Telemetry tests. This is done by seeing at least
 # one all-green test run. As this happens for each bot, we'll add it to this
 # whitelist, making it eligible to run only BattOr power tests.
 GOOD_POWER_PERF_BOT_WHITELIST = [
@@ skipping 396 matching lines @@
     command.ProcessCommandLineArgs(parser, options, environment)
 
   if command == Help:
     command_instance = command(all_commands)
   else:
     command_instance = command()
   if isinstance(command_instance, command_line.OptparseCommand):
     return command_instance.Run(options)
   else:
     return command_instance.Run(options, args)