Specify admin port for local rietveld.

testing_support/local_rietveld.py

 #!/usr/bin/env python
 # 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.
 
 """Setups a local Rietveld instance to test against a live server for
 integration tests.
 
 It makes sure Google AppEngine SDK is found, download Rietveld and Django code
 if necessary and starts the server on a free inbound TCP port.
@@ skipping 21 matching lines @@
 
 
 def test_port(port):
   s = socket.socket()
   try:
     return s.connect_ex(('127.0.0.1', port)) == 0
   finally:
     s.close()
 
 
-def find_free_port():
-  # Test to find an available port starting at 8080.
-  port = 8080
-  max_val = (2<<16)
-  while test_port(port) and port < max_val:
-    port += 1
-  if port == max_val:
-    raise Failure('Having issues finding an available port')
-  return port
+def find_free_port(start_port):
+  """Search for a free port starting at specified port."""
+  for port in xrange(start_port, (2<<16)):
+    if not test_port(port):
+      return port
+  raise Failure('Having issues finding an available port')
 
 
 class LocalRietveld(object):
   """Downloads everything needed to run a local instance of Rietveld."""
 
   def __init__(self, base_dir=None):
     # Paths
     self.base_dir = base_dir
     if not self.base_dir:
       self.base_dir = os.path.dirname(os.path.abspath(__file__))
@@ skipping 42 matching lines @@
       try:
         subprocess2.check_call(
             ['hg', 'co', '-q', '-C', rev], cwd=self.rietveld)
       except (OSError, subprocess2.CalledProcessError), e:
         raise Failure('Failed to sync rietveld\n%s' % e)
 
   def start_server(self, verbose=False):
     self.install_prerequisites()
     assert not self.tempdir
     self.tempdir = tempfile.mkdtemp(prefix='rietveld_test')
-    self.port = find_free_port()
+    self.port = find_free_port(8080)
+    admin_port = find_free_port(self.port + 1)
     if verbose:
       stdout = stderr = None
     else:
       stdout = subprocess2.PIPE
       stderr = subprocess2.STDOUT
     cmd = [
         sys.executable,
         self.dev_app,
         '.',
         '--port', str(self.port),
+        '--admin_port', str(admin_port),
         '--storage', self.tempdir,
         '--clear_search_indexes',
         '--skip_sdk_update_check',
     ]
 
     # CHEAP TRICK
     # By default you only want to bind on loopback but I'm testing over a
     # headless computer so it's useful to be able to access the test instance
     # remotely.
     if os.environ.get('GAE_LISTEN_ALL', '') == 'true':
@@ skipping 39 matching lines @@
     instance.start_server(verbose=options.verbose)
     print 'Local rietveld instance started on port %d' % instance.port
     while True:
       time.sleep(0.1)
   finally:
     instance.stop_server()
 
 
 if __name__ == '__main__':
   main()