Removing bad-continuation param and fixing resulting errors. Fixed indentation errors, in telemetry…

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
@@ skipping 15 matching lines @@
 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 = [
+GOOD_POWER_PERF_BOT_WHITELIST = [\
   "Mac Power Dual-GPU Perf",
-  "Mac Power Low-End Perf"
-]
+  "Mac Power Low-End Perf"]
 
 
-DEFAULT_LOG_FORMAT = (
+DEFAULT_LOG_FORMAT = (\
   '(%(levelname)s) %(asctime)s %(module)s.%(funcName)s:%(lineno)d  '
   '%(message)s')
 
 
 def _IsBenchmarkEnabled(benchmark_class, possible_browser):
   return (issubclass(benchmark_class, benchmark.Benchmark) and
           decorators.IsBenchmarkEnabled(benchmark_class, possible_browser))
 
 
 def PrintBenchmarkList(benchmarks, possible_browser, output_pipe=sys.stdout):
   """ Print benchmarks that are not filtered in the same order of benchmarks in
   the |benchmarks| list.
 
   Args:
     benchmarks: the list of benchmarks to be printed (in the same order of the
       list).
     possible_browser: the possible_browser instance that's used for checking
       which benchmarks are enabled.
     output_pipe: the stream in which benchmarks are printed on.
   """
   if not benchmarks:
     print >> output_pipe, 'No benchmarks found!'
     return
 
-  bad_benchmark = next(
+  bad_benchmark = next(\
     (b for b in benchmarks if not issubclass(b, benchmark.Benchmark)), None)
-  assert bad_benchmark is None, (
+  assert bad_benchmark is None, (\
     '|benchmarks| param contains non benchmark class: %s' % bad_benchmark)
 
   # Align the benchmark names to the longest one.
   format_string = '  %%-%ds %%s' % max(len(b.Name()) for b in benchmarks)
   disabled_benchmarks = []
 
   print >> output_pipe, 'Available benchmarks %sare:' % (
       'for %s ' % possible_browser.browser_type if possible_browser else '')
 
   # Sort the benchmarks by benchmark name.
@@ skipping 163 matching lines @@
 
   def Run(self, args):
     return min(255, self._benchmark().Run(args))
 
 
 def _ScriptName():
   return os.path.basename(sys.argv[0])
 
 
 def _MatchingCommands(string, commands):
-  return [command for command in commands
-         if command.Name().startswith(string)]
+  return [command for command in commands \
+      if command.Name().startswith(string)]
 
 @decorators.Cache
 def _Benchmarks(environment):
   benchmarks = []
   for search_dir in environment.benchmark_dirs:
     benchmarks += discover.DiscoverClasses(search_dir,
                                            environment.top_level_dir,
                                            benchmark.Benchmark,
                                            index_by_class_name=True).values()
   return benchmarks
@@ skipping 49 matching lines @@
       ...
     }
   }
   """
   # TODO(charliea): Remove this once we have more power perf bots.
   only_run_battor_benchmarks = False
   print 'Environment variables: ', os.environ
   if os.environ.get('BUILDBOT_BUILDERNAME') in GOOD_POWER_PERF_BOT_WHITELIST:
     only_run_battor_benchmarks = True
 
-  output = {
+  output = {\
     'version': 1,
     'steps': {
-    }
-  }
+    }}
   for benchmark_class in benchmark_classes:
     # Filter out benchmarks in tools/perf/contrib/ directory
     # This is a terrible hack but we should no longer need this
     # _GetJsonBenchmarkList once all the perf bots are moved to swarming
     # (crbug.com/715565)
     if ('contrib' in
         os.path.abspath(sys.modules[benchmark_class.__module__].__file__)):
       continue
 
     if not _IsBenchmarkEnabled(benchmark_class, possible_browser):
       continue
 
     base_name = benchmark_class.Name()
     # TODO(charliea): Remove this once we have more power perf bots.
     # Only run battor power benchmarks to reduce the cycle time of this bot.
     # TODO(rnephew): Enable media.* and power.* tests when Mac BattOr issue
     # is solved.
     if only_run_battor_benchmarks and not base_name.startswith('battor'):
       continue
     base_cmd = [sys.executable, os.path.realpath(sys.argv[0]),
                 '-v', '--output-format=chartjson', '--upload-results',
                 base_name]
     perf_dashboard_id = base_name
 
     device_affinity = bot_utils.GetDeviceAffinity(num_shards, base_name)
 
-    output['steps'][base_name] = {
-      'cmd': ' '.join(base_cmd + [
+    output['steps'][base_name] = {\
+      'cmd': ' '.join(base_cmd + [\
             '--browser=%s' % possible_browser.browser_type]),
       'device_affinity': device_affinity,
-      'perf_dashboard_id': perf_dashboard_id,
-    }
+      'perf_dashboard_id': perf_dashboard_id}
     if (possible_reference_browser and
         _IsBenchmarkEnabled(benchmark_class, possible_reference_browser)):
-      output['steps'][base_name + '.reference'] = {
-        'cmd': ' '.join(base_cmd + [
+      output['steps'][base_name + '.reference'] = {\
+        'cmd': ' '.join(base_cmd + [\
               '--browser=reference', '--output-trace-tag=_ref']),
         'device_affinity': device_affinity,
-        'perf_dashboard_id': perf_dashboard_id,
-      }
+        'perf_dashboard_id': perf_dashboard_id}
 
   return json.dumps(output, indent=2, sort_keys=True)
 
 
 def main(environment, extra_commands=None, **log_config_kwargs):
   # The log level is set in browser_options.
   log_config_kwargs.pop('level', None)
   log_config_kwargs.setdefault('format', DEFAULT_LOG_FORMAT)
   logging.basicConfig(**log_config_kwargs)
 
@@ skipping 54 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)