Upstream chrome_test_server_spawner.py for Android.

build/android/pylib/chrome_test_server_spawner.py

Index: build/android/pylib/chrome_test_server_spawner.py
diff --git a/build/android/pylib/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py
index 75a61c1a67ae42f1052197d1c0f9069e0a34fd06..bdca493fb4e020e479e91b6ca5340a533b3136f0 100644
--- a/build/android/pylib/chrome_test_server_spawner.py
+++ b/build/android/pylib/chrome_test_server_spawner.py
@@ -10,95 +10,375 @@ chrome test server on the host.
 
 import BaseHTTPServer
 import logging
+import json

[bulach, 2012/08/29 09:22:54]

nit: before logging

[Philippe, 2012/08/29 11:29:05]

Done.

 import os
+import select
+import struct
+import subprocess
 import sys
 import threading
 import time
 import urlparse
 
-# Path that are needed to import testserver
-cr_src = os.path.join(os.path.abspath(os.path.dirname(__file__)),
-                      '..', '..', '..')
-sys.path.append(os.path.join(cr_src, 'third_party'))
-sys.path.append(os.path.join(cr_src, 'third_party', 'tlslite'))
-sys.path.append(os.path.join(cr_src, 'third_party', 'pyftpdlib', 'src'))
-sys.path.append(os.path.join(cr_src, 'net', 'tools', 'testserver'))
-import testserver
+import constants
+from forwarder import Forwarder
+import ports
+

[bulach, 2012/08/29 09:22:54]

nit: need another \n

[Philippe, 2012/08/29 11:29:05]

Done.

+# Path that are needed to import necessary modules when running testserver.py.
+os.environ['PYTHONPATH'] += ':%s:%s:%s:%s' % (
+    os.path.join(constants.CHROME_DIR, 'third_party'),
+    os.path.join(constants.CHROME_DIR, 'third_party', 'tlslite'),
+    os.path.join(constants.CHROME_DIR, 'third_party', 'pyftpdlib', 'src'),
+    os.path.join(constants.CHROME_DIR, 'net', 'tools', 'testserver'))
+

[Philippe, 2012/08/29 11:29:05]

Do we need another \n here? I'm adding it to be consistent with your comment
line 41.

+SERVER_TYPES = {
+  'http': '',

[bulach, 2012/08/29 09:22:54]

nit: 35-39 needs indent by 4

[Philippe, 2012/08/29 11:29:05]

Done.

+  'ftp': '-f',
+  'sync': '--sync',
+  'tcpecho': '--tcp-echo',
+  'udpecho': '--udp-echo',
+}
+

[bulach, 2012/08/29 09:22:54]

nit: need another \n

[Philippe, 2012/08/29 11:29:05]

Done.

+# The timeout (in seconds) of starting up the Python test server.
+TEST_SERVER_STARTUP_TIMEOUT = 10
+
+
+def CheckPortStatus(port, expected_status):

[bulach, 2012/08/29 09:22:54]

nit: it seems that this function, and most of the methods in the classes below,
are not "public".. perhaps we could add a "_" prefix to them?

[Philippe, 2012/08/29 11:29:05]

Sounds good. Done.

+  """Returns True if port has expected_status.
+
+  Args:
+    port: the port number.
+    expected_status: boolean of expected status.
+  Returns:
+    Returns True if the status is expected. Otherwise returns False.
+  """
+  for timeout in range(1, 5):
+    if ports.IsHostPortUsed(port) == expected_status:
+      return True
+    time.sleep(timeout)
+  return False
+
+
+def GetServerTypeCommandLine(server_type_string):
+  """Returns the command-line by the given server type.
+
+  This function translates the server type string into the appropriate
+  command-line argument by following the option definitions in testserver.py.

[bulach, 2012/08/29 09:22:54]

nit: need "Args:" and "Returns:"..
also, it'd be nice to consolidate in a one line docstring, something like:

"""Returns the command-line argument for testserver.py.

Args:
  server_type_string: the server type to be used.
Returns:
  A string containing the command-line argument.
"""

[Philippe, 2012/08/29 11:29:05]

Done.

+  """
+  if server_type_string not in SERVER_TYPES:
+    raise NotImplementedError('Unknown server type: %s' % server_type)

[bulach, 2012/08/29 09:22:54]

nit: server_type is undefined, needs to be "server_type_string".. tbh, I think
we can remove the "_string" suffix altogether..

[Philippe, 2012/08/29 11:29:05]

Done.

+  if server_type_string == 'udpecho':
+    raise Exception('Please do not run UDP echo tests because we do not have '
+                    'a UDP forwarder tool.')
+  return SERVER_TYPES[server_type_string]
+
+
+class TestServerThread(threading.Thread):
+  """The class to run a test server in a separate process in a thread.

[bulach, 2012/08/29 09:22:54]

nit: needs to be one line, probably something like:
"""A thread to run the test server in a separate process."""

[Philippe, 2012/08/29 11:29:05]

Done.

+  """
+
+  def __init__(self, ready_event, arguments, adb, tool, build_type):
+    """Initialize TestServerThread with the following argument.
+
+    Args:
+      ready_event: event which will be set when the test server is ready.
+      arguments: dictionary of arguments to run the test server.
+      adb: instance of AndroidCommands.
+      tool: instance of runtime error detection tool.
+      build_type: 'Release' or 'Debug'.
+    """
+    threading.Thread.__init__(self)
+    self.wait_event = threading.Event()
+    self.stop_flag = False
+    self.ready_event = ready_event
+    self.ready_event.clear()
+    self.arguments = arguments
+    self.adb = adb
+    self.tool = tool
+    self.test_server_process = None
+    self.is_ready = False
+    self.host_port = self.arguments['port']
+    assert isinstance(self.host_port, int)
+    self._test_server_forwarder = None
+    # The forwarder device port now is dynamically allocated.
+    self.forwarder_device_port = 0;

[bulach, 2012/08/29 09:22:54]

nit: remove ;

[Philippe, 2012/08/29 11:29:05]

Done.

+    # Anonymous pipe in order to get port info from test server.
+    self.pipe_in = None
+    self.pipe_out = None
+    self.command_line = []
+    self.build_type = build_type
+
+  def WaitToStartAndGetPortFromTestServer(self):
+    """Waits for the Python test server to start and get port it is using. The

[bulach, 2012/08/29 09:22:54]

nit: needs a one line docstring.

[Philippe, 2012/08/29 11:29:05]

Done.

+    port information is passed by the Python test server with a pipe given by
+    self.pipe_out.
+
+    Return:

[bulach, 2012/08/29 09:22:54]

nit: Returns:

[Philippe, 2012/08/29 11:29:05]

Done.

+      True if successfully gets port used by the Python test server.
+    """
+    assert self.host_port == 0 and self.pipe_out and self.pipe_in
+    (in_fds, out_fds, err_fds) = select.select([self.pipe_in,],[],[],

[bulach, 2012/08/29 09:22:54]

nit: out_fds and err_fds seem unused, maybe replace with _ and __ ?
also, spaces after the "," in the "select" arguments..

[Philippe, 2012/08/29 11:29:05]

Done.

+                                               TEST_SERVER_STARTUP_TIMEOUT)
+    if len(in_fds) == 0:
+      logging.error('Failed to wait to the Python test server to be started.')
+      return False
+    # First read the data length as an unsigned 4-byte value.  This
+    # is _not_ using network byte ordering since the Python test server packs
+    # size as native byte order and all Chromium platforms so far are
+    # configured to use little-endian.
+    # TODO(jnd): Change the Python test server and local_test_server_*.cc to
+    # use a unified byte order (either big-endian or little-endian).
+    data_length = os.read(self.pipe_in, struct.calcsize('=L'))
+    if data_length:
+      (data_length, ) = struct.unpack('=L', data_length)

[bulach, 2012/08/29 09:22:54]

nit: no space after ,

[Philippe, 2012/08/29 11:29:05]

Done.

+      assert data_length
+    if not data_length:
+      logging.error('Failed to get length of server data.')
+      return False
+    port_json = os.read(self.pipe_in, data_length)
+    if not port_json:
+      logging.error('Failed to get server data.')
+      return False
+    logging.info('Got port json data: %s' % port_json)

[bulach, 2012/08/29 09:22:54]

nit: logging can do the formatting itself, so use "," rather than "%" to let it
format.

[Philippe, 2012/08/29 11:29:05]

Done.

+    port_json = json.loads(port_json)
+    if port_json.has_key('port') and isinstance(port_json['port'], int):
+      self.host_port = port_json['port']
+      return CheckPortStatus(self.host_port, True)
+    logging.error('Failed to get port information from the server data.')
+    return False
+
+  def GenerateCommandLineArguments(self):
+    """Generate the command lines based on the input arguments to run

[bulach, 2012/08/29 09:22:54]

nit: one line docstring

[Philippe, 2012/08/29 11:29:05]

Done.

+    the test server. All options are processed by following the definitions
+    in testserver.py"""
+    if self.command_line:
+      return
+    # The following arguments must exist.
+    type_cmd = GetServerTypeCommandLine(self.arguments['server-type'])
+    if type_cmd:
+      self.command_line.append(type_cmd)
+    self.command_line.append('--port=%d' % self.host_port)
+    # Use a pipe to get the port given by the instance of Python test server
+    # if the test does not specify the port.
+    if self.host_port == 0:
+      (self.pipe_in, self.pipe_out) = os.pipe()
+      self.command_line.append('--startup-pipe=%d' % self.pipe_out)
+    self.command_line.append('--host=%s' % self.arguments['host'])
+    data_dir = self.arguments['data-dir'] or 'chrome/test/data'
+    if not os.path.isabs(data_dir):
+      data_dir = os.path.join(constants.CHROME_DIR, data_dir)
+    self.command_line.append('--data-dir=%s' % data_dir)
+    # The following arguments are optional depending on the individual test.
+    if self.arguments.has_key('log-to-console'):
+      self.command_line.append('--log-to-console')
+    if self.arguments.has_key('auth-token'):
+      self.command_line.append('--auth-token=%s' % self.arguments['auth-token'])
+    if self.arguments.has_key('https'):
+      self.command_line.append('--https')
+      if self.arguments.has_key('cert-and-key-file'):
+        self.command_line.append('--cert-and-key-file=%s' % os.path.join(
+            constants.CHROME_DIR, self.arguments['cert-and-key-file']))
+      if self.arguments.has_key('ocsp'):
+        self.command_line.append('--ocsp=%s' % self.arguments['ocsp'])
+      if self.arguments.has_key('https-record-resume'):
+        self.command_line.append('--https-record-resume')
+      if self.arguments.has_key('ssl-client-auth'):
+        self.command_line.append('--ssl-client-auth')
+      if self.arguments.has_key('tls-intolerant'):
+        self.command_line.append('--tls-intolerant')
+      if self.arguments.has_key('ssl-client-ca'):
+        for ca in self.arguments['ssl-client-ca']:
+          self.command_line.append('--ssl-client-ca=%s' %
+                                   os.path.join(constants.CHROME_DIR, ca))
+      if self.arguments.has_key('ssl-bulk-cipher'):
+        for bulk_cipher in self.arguments['ssl-bulk-cipher']:
+          self.command_line.append('--ssl-bulk-cipher=%s' % bulk_cipher)
+
+  def run(self):
+    logging.info('Start running the thread!')
+    self.wait_event.clear()
+    self.GenerateCommandLineArguments()
+    command = '%s %s' % (
+        os.path.join(constants.CHROME_DIR, 'net', 'tools', 'testserver',
+                     'testserver.py'),
+        ' '.join(self.command_line))
+    logging.info(command)
+    self.process = subprocess.Popen(command, shell=True)
+    if self.process:
+      if self.pipe_out:
+        self.is_ready = self.WaitToStartAndGetPortFromTestServer()
+      else:
+        self.is_ready = CheckPortStatus(self.host_port, True)
+    if self.is_ready:
+      self._test_server_forwarder = Forwarder(
+          self.adb, [(0, self.host_port)], self.tool, '127.0.0.1',
+          self.build_type)
+      # Check whether the forwarder is ready on the device.
+      self.is_ready = False
+      device_port = self._test_server_forwarder.DevicePortForHostPort(
+          self.host_port)
+      if device_port:
+        for timeout in range(1, 5):
+          if ports.IsDevicePortUsed(self.adb, device_port, 'LISTEN'):
+            self.is_ready = True
+            self.forwarder_device_port = device_port
+            break
+          time.sleep(timeout)
+    # Wake up the request handler thread.
+    self.ready_event.set()
+    # Keep thread running until Stop() gets called.
+    while not self.stop_flag:
+      time.sleep(1)
+    if self.process.poll() == None:

[bulach, 2012/08/29 09:22:54]

nit: "is None"

[Philippe, 2012/08/29 11:29:05]

Done.

+      self.process.kill()
+    if self._test_server_forwarder:
+      self._test_server_forwarder.Close()
+    self.process = None
+    self.is_ready = False
+    if self.pipe_out:
+      os.close(self.pipe_in)
+      os.close(self.pipe_out)
+      self.pipe_in = None
+      self.pipe_out = None
+    logging.info('Test-server has died.')
+    self.wait_event.set()
+
+  def Stop(self):
+    """Blocks until the loop has finished. This must be called in another

[bulach, 2012/08/29 09:22:54]

nit: one line

[Philippe, 2012/08/29 11:29:05]

Done.

+    thread.
+    """
+    if not self.process:
+      return
+    self.stop_flag = True
+    self.wait_event.wait()
 
-_test_servers = []
 
 class SpawningServerRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-  """A handler used to process http GET request.
+  """A handler used to process http GET/POST request.

[bulach, 2012/08/29 09:22:54]

nit: one line

[Philippe, 2012/08/29 11:29:05]

Done.

   """
 
-  def GetServerType(self, server_type):
-    """Returns the server type to use when starting the test server.
+  def SendResponse(self, response_code, response_reason, additional_headers,
+                   contents):
+    """Generate response according to specified parameters and send it back
+    to client.

[bulach, 2012/08/29 09:22:54]

nit: one line

[Philippe, 2012/08/29 11:29:05]

Done.

 
-    This function translate the command-line argument into the appropriate
-    numerical constant.
-    # TODO(yfriedman): Do that translation!
+    Args:
+      response_code: number of the response status.
+      response_reason: string of reason description of the response.
+      additional_headers: dict of additional headers. Each key is the name of
+                          the header, each value is the content of the header.
+      contents: string of the contents we want to send to client.
     """
-    if server_type:
-      pass
-    return 0
+    self.send_response(response_code, response_reason)
+    self.send_header('Content-Type', 'text/html')
+    # Specify the content-length as without it the http(s) response will not
+    # be completed properly (and the browser keeps expecting data).
+    self.send_header('Content-Length', len(contents))
+    for header_name in additional_headers:
+      self.send_header(header_name, additional_headers[header_name])
+    self.end_headers()
+    self.wfile.write(contents)
+    self.wfile.flush()
+
+  def StartTestServer(self):

[bulach, 2012/08/29 09:22:54]

nit: needs docstring

[Philippe, 2012/08/29 11:29:05]

Done.

+    logging.info('Handling request to spawn a test server.')
+    content_type = self.headers.getheader('content-type')
+    if content_type != 'application/json':
+      raise Exception('Bad content-type for start request.')
+    content_length = self.headers.getheader('content-length')
+    if not content_length:
+      content_length = 0
+    try:
+      content_length = int(content_length)
+    except:
+      raise Exception('Bad content-length for start request.')
+    logging.info(content_length)
+    test_server_argument_json = self.rfile.read(content_length)
+    logging.info(test_server_argument_json)
+    assert not self.server.test_server_instance
+    ready_event = threading.Event()
+    self.server.test_server_instance = TestServerThread(
+        ready_event,
+        json.loads(test_server_argument_json),
+        self.server.adb,
+        self.server.tool,
+        self.server.build_type)
+    self.server.test_server_instance.setDaemon(True)
+    self.server.test_server_instance.start()
+    ready_event.wait()
+    if self.server.test_server_instance.is_ready:
+      self.SendResponse(200, 'OK', {}, json.dumps(
+          {'port': self.server.test_server_instance.forwarder_device_port,
+           'message': 'started'}))
+      logging.info('Test server is running on port: %d.' %

[bulach, 2012/08/29 09:22:54]

nit: as above, s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

+                   self.server.test_server_instance.host_port)
+    else:
+      self.server.test_server_instance.Stop()
+      self.server.test_server_instance = None
+      self.SendResponse(500, 'Test Server Error.', {}, '')
+      logging.info('Encounter problem during starting a test server.')
+
+  def KillTestServer(self):

[bulach, 2012/08/29 09:22:54]

nit: need docstring

[Philippe, 2012/08/29 11:29:05]

Done.

+    # There should only ever be one test server at a time. This may do the
+    # wrong thing if we try and start multiple test servers.
+    if not self.server.test_server_instance:
+      return
+    port = self.server.test_server_instance.host_port
+    logging.info('Handling request to kill a test server on port: %d.' % port)
+    self.server.test_server_instance.Stop()
+    # Make sure the status of test server is correct before sending response.
+    if CheckPortStatus(port, False):
+      self.SendResponse(200, 'OK', {}, 'killed')
+      logging.info('Test server on port %d is killed' % port)

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

+    else:
+      self.SendResponse(500, 'Test Server Error.', {}, '')
+      logging.info('Encounter problem during killing a test server.')
+    self.server.test_server_instance = None
+
+  def do_POST(self):
+    parsed_path = urlparse.urlparse(self.path)
+    action = parsed_path.path
+    logging.info('Action for POST method is: %s.' % action)

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

+    if action == '/start':
+      self.StartTestServer()
+    else:
+      self.SendResponse(400, 'Unknown request.', {}, '')
+      logging.info('Encounter unknown request: %s.' % action)

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

 
   def do_GET(self):
     parsed_path = urlparse.urlparse(self.path)
     action = parsed_path.path
     params = urlparse.parse_qs(parsed_path.query, keep_blank_values=1)
-    logging.info('Action is: %s' % action)
-    if action == '/killserver':
-      # There should only ever be one test server at a time. This may do the
-      # wrong thing if we try and start multiple test servers.
-      _test_servers.pop().Stop()
-    elif action == '/start':
-      logging.info('Handling request to spawn a test webserver')
-      for param in params:
-        logging.info('%s=%s' % (param, params[param][0]))
-      s_type = 0
-      doc_root = None
-      if 'server_type' in params:
-        s_type = self.GetServerType(params['server_type'][0])
-      if 'doc_root' in params:
-        doc_root = params['doc_root'][0]
-      self.webserver_thread = threading.Thread(
-          target=self.SpawnTestWebServer, args=(s_type, doc_root))
-      self.webserver_thread.setDaemon(True)
-      self.webserver_thread.start()
-    self.send_response(200, 'OK')
-    self.send_header('Content-type', 'text/html')
-    self.end_headers()
-    self.wfile.write('<html><head><title>started</title></head></html>')
-    logging.info('Returned OK!!!')
-
-  def SpawnTestWebServer(self, s_type, doc_root):
-    class Options(object):
-      log_to_console = True
-      server_type = s_type
-      port = self.server.test_server_port
-      data_dir = doc_root or 'chrome/test/data'
-      file_root_url = '/files/'
-      cert = False
-      policy_keys = None
-      policy_user = None
-      startup_pipe = None
-    options = Options()
-    logging.info('Listening on %d, type %d, data_dir %s' % (options.port,
-        options.server_type, options.data_dir))
-    testserver.main(options, None, server_list=_test_servers)
-    logging.info('Test-server has died.')
+    logging.info('Action for GET method is: %s.' % action)

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

+    for param in params:
+      logging.info('%s=%s' % (param, params[param][0]))

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

+    expect_exist = False

[bulach, 2012/08/29 09:22:54]

nit: unused..

[Philippe, 2012/08/29 11:29:05]

Done.

+    if action == '/kill':
+      self.KillTestServer()
+    elif action == '/ping':
+      # The ping handler is used to check whether the spawner server is ready
+      # to serve the requests. We don't need to test the status of the test
+      # server when handling ping request.
+      self.SendResponse(200, 'OK', {}, 'ready')
+      logging.info('Handled ping request and sent response.')
+    else:
+      self.SendResponse(400, 'Unknown request', {}, '')
+      logging.info('Encounter unknown request: %s.' % action)

[bulach, 2012/08/29 09:22:54]

nit: s/%/,/

[Philippe, 2012/08/29 11:29:05]

Done.

 
 
 class SpawningServer(object):
   """The class used to start/stop a http server.

[bulach, 2012/08/29 09:22:54]

nit: one line

[Philippe, 2012/08/29 11:29:05]

Done.

   """
 
-  def __init__(self, test_server_spawner_port, test_server_port):
-    logging.info('Creating new spawner %d', test_server_spawner_port)
-    self.server = testserver.StoppableHTTPServer(('', test_server_spawner_port),
-                                                 SpawningServerRequestHandler)
+  def __init__(self, test_server_spawner_port, adb, tool, build_type):
+    logging.info('Creating new spawner on port: %d.', test_server_spawner_port)
+    self.server = BaseHTTPServer.HTTPServer(('', test_server_spawner_port),
+                                            SpawningServerRequestHandler)
     self.port = test_server_spawner_port
-    self.server.test_server_port = test_server_port
+    self.server.adb = adb
+    self.server.tool = tool
+    self.server.test_server_instance = None
+    self.server.build_type = build_type
 
   def Listen(self):
     logging.info('Starting test server spawner')
@@ -111,4 +391,6 @@ class SpawningServer(object):
     time.sleep(1)
 
   def Stop(self):
-    self.server.Stop()
+    if self.server.test_server_instance:
+      self.server.test_server_instance.Stop()
+    self.server.shutdown()