[Android] Nuke the test server port lockfile explicitly.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 7a14a7166735dffa60f5f91610d76ac0e9f34840..9fcc789b09763cd0b96828cc53413e5a303cc517 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -820,6 +820,7 @@ def RunTestsCommand(args): # pylint: disable=too-many-return-statements
   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,