[Telemetry] Pass test_runner environment in local args instead of a global variable

tools/telemetry/telemetry/unittest_util/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 import decorators
 from telemetry.core import browser_finder
 from telemetry.core import browser_finder_exceptions
 from telemetry.core import browser_options
 from telemetry.core import command_line
@@ skipping 17 matching lines @@
     self.stream = sys.stdout
 
   @classmethod
   def CreateParser(cls):
     options = browser_options.BrowserFinderOptions()
     options.browser_type = 'any'
     parser = options.CreateParser('%%prog %s' % cls.usage)
     return parser
 
   @classmethod
-  def AddCommandLineArgs(cls, parser):
+  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).')
 
     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):
+  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
 
     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)
 
   @classmethod
   def main(cls, args=None, stream=None):  # pylint: disable=W0221
     # We override the superclass so that we can hook in the 'stream' arg.
     parser = cls.CreateParser()
-    cls.AddCommandLineArgs(parser)
+    cls.AddCommandLineArgs(parser, None)
     options, positional_args = parser.parse_args(args)
     options.positional_args = positional_args
-    cls.ProcessCommandLineArgs(parser, options)
+    cls.ProcessCommandLineArgs(parser, options, None)
 
     obj = cls()
     if stream is not None:
       obj.stream = stream
     return obj.Run(options)
 
   def Run(self, args):
     possible_browser = browser_finder.FindBrowser(args)
 
     runner = typ.Runner()
@@ skipping 90 matching lines @@
 
 
 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)