[android_webview] Support null AwWebResourceResponse headers.

build/android/pylib/base/base_test_runner.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.
 
 """Base class for running tests on a single device."""
 
 import logging
 import time
 
 from pylib import ports
@@ skipping 97 matching lines @@
       port: port on which we want to the http server bind.
       extra_config_contents: Extra config contents for the HTTP server.
     """
     self._http_server = lighttpd_server.LighttpdServer(
         document_root, port=port, extra_config_contents=extra_config_contents)
     if self._http_server.StartupHttpServer():
       logging.info('http server started: http://localhost:%s',
                    self._http_server.port)
     else:
       logging.critical('Failed to start http server')
-    self._ForwardPortsForHttpServer()
+    #self._ForwardPortsForHttpServer()
     return (self._forwarder_device_port, self._http_server.port)
 
   def _ForwardPorts(self, port_pairs):
     """Forwards a port."""
     Forwarder.Map(port_pairs, self.device, self.tool)
 
   def _UnmapPorts(self, port_pairs):
     """Unmap previously forwarded ports."""
     for (device_port, _) in port_pairs:
       Forwarder.UnmapDevicePort(device_port, self.device)
@@ skipping 13 matching lines @@
     The forwarder forwards HTTP requests and responses between host and device.
     """
     self._ForwardPorts([(self._forwarder_device_port, self._http_server.port)])
 
   def _RestartHttpServerForwarderIfNecessary(self):
     """Restarts the forwarder if it's not open."""
     # Checks to see if the http server port is being used.  If not forwards the
     # request.
     # TODO(dtrainor): This is not always reliable because sometimes the port
     # will be left open even after the forwarder has been killed.
+    return

[benm (inactive), 2014/07/23 01:09:40]

is this right?

[mkosiba (inactive), 2014/07/24 16:08:28]

accident. reverted.

     if not ports.IsDevicePortUsed(self.device, self._forwarder_device_port):
       self._ForwardPortsForHttpServer()
 
   def ShutdownHelperToolsForTestSuite(self):
     """Shuts down the server and the forwarder."""
     if self._http_server:
       self._UnmapPorts([(self._forwarder_device_port, self._http_server.port)])
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
 
   def CleanupSpawningServerState(self):
     """Tells the spawning server to clean up any state.
 
     If the spawning server is reused for multiple tests, this should be called
     after each test to prevent tests affecting each other.
     """
     if self._spawning_server:
       self._spawning_server.CleanupState()
 
   def LaunchChromeTestServerSpawner(self):
     """Launches test server spawner."""
     server_ready = False
     error_msgs = []
     # TODO(pliard): deflake this function. The for loop should be removed as
     # well as IsHttpServerConnectable(). spawning_server.Start() should also
     # block until the server is ready.
     # Try 3 times to launch test spawner server.
+    return
     for _ in xrange(0, 3):
       self.test_server_spawner_port = ports.AllocateTestServerPort()
       self._ForwardPorts(
           [(self.test_server_spawner_port, self.test_server_spawner_port)])
       self._spawning_server = SpawningServer(self.test_server_spawner_port,
                                              self.device,
                                              self.tool)
       self._spawning_server.Start()
       server_ready, error_msg = ports.IsHttpServerConnectable(
           '127.0.0.1', self.test_server_spawner_port, path='/ping',
           expected_read='ready')
       if server_ready:
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()