Add test_server_setup.py and add support for additional flags.

build/android/pylib/constants.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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 import collections
 import os
 import subprocess
 import sys
@@ skipping 69 matching lines @@
         None),
 }
 
 
 # Ports arrangement for various test servers used in Chrome for Android.
 # Lighttpd server will attempt to use 9000 as default port, if unavailable it
 # will find a free port from 8001 - 8999.
 LIGHTTPD_DEFAULT_PORT = 9000
 LIGHTTPD_RANDOM_PORT_FIRST = 8001
 LIGHTTPD_RANDOM_PORT_LAST = 8999
+TEST_SEARCH_BY_IMAGE_SERVER_PORT = 9041
 TEST_SYNC_SERVER_PORT = 9031
-TEST_SEARCH_BY_IMAGE_SERVER_PORT = 9041
+TEST_SERVER_HOST = '127.0.0.1'
+
+# Paths for various test server executables.
+TEST_NET_SERVER_PATH = 'net/tools/testserver/testserver.py'
+TEST_SYNC_SERVER_PATH = 'sync/tools/testserver/sync_testserver.py'

[frankf, 2013/08/30 18:22:43]

So these constants only needed to be used by modules importing TestServer right?
So it makes more sense to move them there. You can just leave a copy for the
ones currently referenced downstream and do clean up later.

[nyquist, 2013/08/30 21:50:59]

Done. Also reverted my other change to this patch.
Keeping port numbers here to have them all in one place so there is no port
collisions.

 
 # The net test server is started from port 10201.
 # TODO(pliard): http://crbug.com/239014. Remove this dirty workaround once
 # http://crbug.com/239014 is fixed properly.
 TEST_SERVER_PORT_FIRST = 10201
 TEST_SERVER_PORT_LAST = 30000
 # A file to record next valid port of test server.
 TEST_SERVER_PORT_FILE = '/tmp/test_server_port'
 TEST_SERVER_PORT_LOCKFILE = '/tmp/test_server_port.lock'
 
@@ skipping 41 matching lines @@
   except OSError:
     print >> sys.stderr, 'No adb found in $PATH, fallback to checked in binary.'
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 
 ADB_PATH = _GetADBPath()
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88