Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

build/android/pylib/ports.py

 # Copyright (c) 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.
 
 """Functions that deals with local and device ports."""
 
 import contextlib
 import fcntl
 import httplib
 import logging
@@ skipping 28 matching lines @@
 
 
 def AllocateTestServerPort():
   """Allocate a port incrementally.
 
   Returns:
     Returns a valid port which should be in between TEST_SERVER_PORT_FIRST and
     TEST_SERVER_PORT_LAST. Returning 0 means no more valid port can be used.
   """
   port = 0
+  ports_tried = []
   try:
     fp_lock = open(constants.TEST_SERVER_PORT_LOCKFILE, 'w')
     fcntl.flock(fp_lock, fcntl.LOCK_EX)
     # Get current valid port and calculate next valid port.
     assert os.path.exists(constants.TEST_SERVER_PORT_FILE)
     with open(constants.TEST_SERVER_PORT_FILE, 'r+') as fp:
       port = int(fp.read())
+      ports_tried.append(port)
       while IsHostPortUsed(port):
         port += 1
+        ports_tried.append(port)
       if (port > constants.TEST_SERVER_PORT_LAST or
           port < constants.TEST_SERVER_PORT_FIRST):
         port = 0
       else:
         fp.seek(0, os.SEEK_SET)
         fp.write('%d' % (port + 1))
   except Exception as e:
     logging.info(e)
   finally:
     if fp_lock:
       fcntl.flock(fp_lock, fcntl.LOCK_UN)
       fp_lock.close()
-  logging.info('Allocate port %d for test server.', port)
+  if port:
+    logging.info('Allocate port %d for test server.', port)
+  else:
+    logging.error('Could not allocate port for test server. '
+                  'List of ports tried: %s', str(ports_tried))
   return port
 
 
 def IsHostPortUsed(host_port):
   """Checks whether the specified host port is used or not.
 
   Uses -n -P to inhibit the conversion of host/port numbers to host/port names.
 
   Args:
     host_port: Port on host we want to check.
@@ skipping 70 matching lines @@
         client_error = ('Bad response: %s %s version %s\n  ' %
                         (r.status, r.reason, r.version) +
                         '\n  '.join([': '.join(h) for h in r.getheaders()]))
     except (httplib.HTTPException, socket.error) as e:
       # Probably too quick connecting: try again.
       exception_error_msgs = traceback.format_exception_only(type(e), e)
       if exception_error_msgs:
         client_error = ''.join(exception_error_msgs)
   # Only returns last client_error.
   return (False, client_error or 'Timeout')