GTTF: test server cleanup:

net/tools/testserver/testserver.py

 #!/usr/bin/python2.4
 # Copyright (c) 2006-2010 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 server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 It defaults to living on localhost:8888.
 It can use https if you specify the flag --https=CERT where CERT is the path
@@ skipping 64 matching lines @@
     try:
       tlsConnection.handshakeServer(certChain=self.cert_chain,
                                     privateKey=self.private_key,
                                     sessionCache=self.session_cache)
       tlsConnection.ignoreAbruptClose = True
       return True
     except tlslite.api.TLSError, error:
       print "Handshake failure:", str(error)
       return False
 
-class ForkingHTTPServer(SocketServer.ForkingMixIn, StoppableHTTPServer):
-  """This is a specialization of of StoppableHTTPServer which serves each
-  request in a separate process"""
-  pass
-
-class ForkingHTTPSServer(SocketServer.ForkingMixIn, HTTPSServer):
-  """This is a specialization of of HTTPSServer which serves each
-  request in a separate process"""
-  pass
-
 class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
   def __init__(self, request, client_address, socket_server):
     self._connect_handlers = [
       self.RedirectConnectHandler,
       self.ServerAuthConnectHandler,
       self.DefaultConnectResponseHandler]
     self._get_handlers = [
       self.KillHandler,
       self.NoCacheMaxAgeTimeHandler,
@@ skipping 1088 matching lines @@
 
   # Try to free up the port if there's an orphaned old instance.
   TryKillingOldServer(port)
 
   if options.server_type == SERVER_HTTP:
     if options.cert:
       # let's make sure the cert file exists.
       if not os.path.isfile(options.cert):
         print 'specified cert file not found: ' + options.cert + ' exiting...'
         return
-      if options.forking:
-        server_class = ForkingHTTPSServer
-      else:
-        server_class = HTTPSServer
-      server = server_class(('127.0.0.1', port), TestPageHandler, options.cert)
+      server = HTTPSServer(('127.0.0.1', port), TestPageHandler, options.cert)
       print 'HTTPS server started on port %d...' % port
     else:
-      if options.forking:
-        server_class = ForkingHTTPServer
-      else:
-        server_class = StoppableHTTPServer
-      server = server_class(('127.0.0.1', port), TestPageHandler)
+      server = StoppableHTTPServer(('127.0.0.1', port), TestPageHandler)
       print 'HTTP server started on port %d...' % port
 
     server.data_dir = MakeDataDir()
     server.file_root_url = options.file_root_url
     MakeDumpDir(server.data_dir)
 
   # means FTP Server
   else:
     my_data_dir = MakeDataDir()
 
@@ skipping 31 matching lines @@
   except KeyboardInterrupt:
     print 'shutting down server'
     server.stop = True
 
 if __name__ == '__main__':
   option_parser = optparse.OptionParser()
   option_parser.add_option("-f", '--ftp', action='store_const',
                            const=SERVER_FTP, default=SERVER_HTTP,
                            dest='server_type',
                            help='FTP or HTTP server: default is HTTP.')
-  option_parser.add_option('--forking', action='store_true', default=False,
-                           dest='forking',
-                           help='Serve each request in a separate process.')
   option_parser.add_option('', '--port', default='8888', type='int',
                            help='Port used by the server.')
   option_parser.add_option('', '--data-dir', dest='data_dir',
                            help='Directory from which to read the files.')
   option_parser.add_option('', '--https', dest='cert',
                            help='Specify that https should be used, specify '
                            'the path to the cert containing the private key '
                            'the server should use.')
   option_parser.add_option('', '--file-root-url', default='/files/',
                            help='Specify a root URL for files served.')
   option_parser.add_option('', '--never-die', default=False,
                            action="store_true",
                            help='Prevent the server from dying when visiting '
                            'a /kill URL. Useful for manually running some '
                            'tests.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))