Android: removes old "keep_test_server_ports".

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs all types of tests from one unified interface."""
 
 import collections
 import logging
@@ skipping 159 matching lines @@
       '-E', '--exclude-annotation', dest='exclude_annotation_str',
       help=('Comma-separated list of annotations. Exclude tests with these '
             'annotations.'))
   option_parser.add_option('--screenshot', dest='screenshot_failures',
                            action='store_true',
                            help='Capture screenshots of test failures')
   option_parser.add_option('--save-perf-json', action='store_true',
                            help='Saves the JSON file for each UI Perf test.')
   option_parser.add_option('--official-build', action='store_true',
                            help='Run official build tests.')
-  option_parser.add_option('--keep_test_server_ports',
-                           action='store_true',
-                           help=('Indicates the test server ports must be '
-                                 'kept. When this is run via a sharder '
-                                 'the test server ports should be kept and '
-                                 'should not be reset.'))
   option_parser.add_option('--test_data', action='append', default=[],
                            help=('Each instance defines a directory of test '
                                  'data that should be copied to the target(s) '
                                  'before running the tests. The argument '
                                  'should be of the form <target>:<source>, '
                                  '<target> is relative to the device data'
                                  'directory, and <source> is relative to the '
                                  'chromium build directory.'))
 
 
 def ProcessJavaTestOptions(options, error_func):
   """Processes options/arguments and populates |options| with defaults."""
 
   if options.annotation_str:
     options.annotations = options.annotation_str.split(',')
   elif options.test_filter:
     options.annotations = []
   else:
     options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest',
                            'EnormousTest']
 
   if options.exclude_annotation_str:
     options.exclude_annotations = options.exclude_annotation_str.split(',')
   else:
     options.exclude_annotations = []
 
-  if not options.keep_test_server_ports:
-    if not ports.ResetTestServerPortAllocation():
-      raise Exception('Failed to reset test server port.')
-
 
 def AddInstrumentationTestOptions(option_parser):
   """Adds Instrumentation test options to |option_parser|."""
 
   option_parser.usage = '%prog instrumentation [options]'
   option_parser.commands_dict = {}
   option_parser.example = ('%prog instrumentation '
                            '--test-apk=ChromiumTestShellTest')
 
   AddJavaTestOptions(option_parser)
@@ skipping 487 matching lines @@
     if ((options.single_step and len(args) <= 2) or
         (not options.single_step and len(args) > 2)):
       option_parser.error('Unrecognized arguments: %s' % (' '.join(args)))
       return constants.ERROR_EXIT_CODE
 
   ProcessCommonOptions(options)
 
   devices = _GetAttachedDevices(options.test_device)
 
   forwarder.Forwarder.RemoveHostLog()
+  if not ports.ResetTestServerPortAllocation():
+    raise Exception('Failed to reset test server port.')
 
   if command == 'gtest':
     return _RunGTests(options, option_parser.error, devices)
   elif command == 'linker':
     return _RunLinkerTests(options, option_parser.error, devices)
   elif command == 'instrumentation':
     return _RunInstrumentationTests(options, option_parser.error, devices)
   elif command == 'uiautomator':
     return _RunUIAutomatorTests(options, option_parser.error, devices)
   elif command == 'monkey':
@@ skipping 73 matching lines @@
 
 def main(argv):
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))