Upstream Android-specific net/ changes.

net/tools/testserver/testserver.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.
 
 """This is a simple HTTP/FTP/SYNC/TCP/UDP/ server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
@@ skipping 1952 matching lines @@
       return False
     result, raw_reply = self.server._sync_handler.HandleCreateSyncedBookmarks()
     self.send_response(result)
     self.send_header('Content-Type', 'text/html')
     self.send_header('Content-Length', len(raw_reply))
     self.end_headers()
     self.wfile.write(raw_reply)
     return True;
 
 
-def MakeDataDir():
+def MakeDataDir(options):
   if options.data_dir:
     if not os.path.isdir(options.data_dir):
       print 'specified data dir not found: ' + options.data_dir + ' exiting...'
       return None
     my_data_dir = options.data_dir
   else:
     # Create the default path to our data dir, relative to the exe dir.
     my_data_dir = os.path.dirname(sys.argv[0])
     my_data_dir = os.path.join(my_data_dir, "..", "..", "..", "..",
                                "test", "data")
@@ skipping 172 matching lines @@
   def do_HEAD(self):
     self._do_common_method()
 
 
 class FileMultiplexer:
   def __init__(self, fd1, fd2) :
     self.__fd1 = fd1
     self.__fd2 = fd2
 
   def __del__(self) :
-    if self.__fd1 != sys.stdout and self.__fd1 != sys.stderr:
-      self.__fd1.close()
-    if self.__fd2 != sys.stdout and self.__fd2 != sys.stderr:
-      self.__fd2.close()
+    self.close()
 
   def write(self, text) :
     self.__fd1.write(text)
     self.__fd2.write(text)
 
   def flush(self) :
     self.__fd1.flush()
     self.__fd2.flush()
 
+  def close(self):
+    if self.__fd1 != sys.stdout and self.__fd1 != sys.stderr:
+      self.__fd1.close()
+    if self.__fd2 != sys.stdout and self.__fd2 != sys.stderr:
+      self.__fd2.close()
+
+
 def main(options, args):
   logfile = open('testserver.log', 'w')
   sys.stderr = FileMultiplexer(sys.stderr, logfile)
   if options.log_to_console:
     sys.stdout = FileMultiplexer(sys.stdout, logfile)
   else:
     sys.stdout = logfile
 
   port = options.port
   host = options.host
@@ skipping 51 matching lines @@
           return
       server = HTTPSServer((host, port), TestPageHandler, pem_cert_and_key,
                            options.ssl_client_auth, options.ssl_client_ca,
                            options.ssl_bulk_cipher, options.record_resume,
                            options.tls_intolerant)
       print 'HTTPS server started on %s:%d...' % (host, server.server_port)
     else:
       server = HTTPServer((host, port), TestPageHandler)
       print 'HTTP server started on %s:%d...' % (host, server.server_port)
 
-    server.data_dir = MakeDataDir()
+    server.data_dir = MakeDataDir(options)
     server.file_root_url = options.file_root_url
     server_data['port'] = server.server_port
     server._device_management_handler = None
     server.policy_keys = options.policy_keys
     server.policy_user = options.policy_user
     server.gdata_auth_token = options.auth_token
   elif options.server_type == SERVER_WEBSOCKET:
     # Launch pywebsocket via WebSocketServer.
     logger = logging.getLogger()
     logger.addHandler(logging.StreamHandler())
     # TODO(toyoshim): Remove following os.chdir. Currently this operation
     # is required to work correctly. It should be fixed from pywebsocket side.
-    os.chdir(MakeDataDir())
+    os.chdir(MakeDataDir(options))
     websocket_options = WebSocketOptions(host, port, '.')
     if options.cert_and_key_file:
       websocket_options.use_tls = True
       websocket_options.private_key = options.cert_and_key_file
       websocket_options.certificate = options.cert_and_key_file
     if options.ssl_client_auth:
       websocket_options.tls_client_auth = True
       if len(options.ssl_client_ca) != 1:
         # TODO(toyoshim): Provide non-zero exit code for these error cases.
         # Ditto on other paths here and there.
@@ skipping 28 matching lines @@
     random.seed()
     server = UDPEchoServer((host, port), UDPEchoHandler)
     print 'Echo UDP server started on port %d...' % server.server_port
     server_data['port'] = server.server_port
   elif options.server_type == SERVER_BASIC_AUTH_PROXY:
     server = HTTPServer((host, port), BasicAuthProxyRequestHandler)
     print 'BasicAuthProxy server started on port %d...' % server.server_port
     server_data['port'] = server.server_port
   # means FTP Server
   else:
-    my_data_dir = MakeDataDir()
+    my_data_dir = MakeDataDir(options)
 
     # Instantiate a dummy authorizer for managing 'virtual' users
     authorizer = pyftpdlib.ftpserver.DummyAuthorizer()
 
     # Define a new user having full r/w permissions and a read-only
     # anonymous user
     authorizer.add_user('chrome', 'chrome', my_data_dir, perm='elradfmw')
 
     authorizer.add_anonymous(my_data_dir)
 
@@ skipping 142 matching lines @@
                            dest='host',
                            help='Hostname or IP upon which the server will '
                            'listen. Client connections will also only be '
                            'allowed from this address.')
   option_parser.add_option('', '--auth-token', dest='auth_token',
                            help='Specify the auth token which should be used'
                            'in the authorization header for GData.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))