[Android] Nuke the test server port lockfile explicitly.

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 argparse
 import collections
@@ skipping 802 matching lines @@
   command = args.command
 
   ProcessCommonOptions(args)
   logging.info('command: %s', ' '.join(sys.argv))
   if args.enable_platform_mode or command in _DEFAULT_PLATFORM_MODE_TESTS:
     return RunTestsInPlatformMode(args)
 
   forwarder.Forwarder.RemoveHostLog()
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
+  os.unlink(ports._TEST_SERVER_PORT_LOCKFILE) # pylint: disable=protected-access

[mikecase (wrong mikecase), 2016/07/26 03:07:06]

do you have to add an...

if os.path.exists(ports._TEST_SERVER_PORT_LOCKFILE)?

It seems os.unlink raises an exception if the file is not found, and it looks
like
the file wont exist since it is currently deleted by
ports.ResetTestServerPortAllocation()

[jbudorick, 2016/07/26 03:24:31]

Good catch. Fixed.

 
   def get_devices():
     return _GetAttachedDevices(args.blacklist_file, args.test_device,
                                args.enable_device_cache, args.num_retries)
 
   if command == 'linker':
     return _RunLinkerTests(args, get_devices())
   elif command == 'junit':
     return _RunJUnitTests(args)
   elif command == 'monkey':
@@ skipping 165 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())