Allow testserver to run without chromiumsync.

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 10 matching lines @@
 import shutil
 import SocketServer
 import sys
 import time
 import urllib2
 
 import pyftpdlib.ftpserver
 import tlslite
 import tlslite.api
 
-import chromiumsync
-
 try:
   import hashlib
   _new_md5 = hashlib.md5
 except ImportError:
   import md5
   _new_md5 = md5.new
 
 SERVER_HTTP = 0
 SERVER_FTP = 1
 
@@ skipping 95 matching lines @@
       'gif': 'image/gif',
       'jpeg' : 'image/jpeg',
       'jpg' : 'image/jpeg',
       'xml' : 'text/xml'
     }
     self._default_mime_type = 'text/html'
 
     BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, request,
                                                    client_address,
                                                    socket_server)
-  # Class variable; shared across requests.
-  _sync_handler = chromiumsync.TestServer()
 
   def _ShouldHandleRequest(self, handler_name):
     """Determines if the path can be handled by the handler.
 
     We consider a handler valid if the path begins with the
     handler name. It can optionally be followed by "?*", "/*".
     """
 
     pattern = re.compile('%s($|\?|/).*' % handler_name)
     return pattern.match(self.path)
@@ skipping 854 matching lines @@
     This covers all sync protocol commands: authentication, getupdates, and
     commit.
     """
     test_name = "/chromiumsync/command"
     if not self._ShouldHandleRequest(test_name):
       return False
 
     length = int(self.headers.getheader('content-length'))
     raw_request = self.rfile.read(length)
 
-    http_response, raw_reply = self._sync_handler.HandleCommand(raw_request)
+    if not self.server._sync_handler:
+      import chromiumsync
+      self.server._sync_handler = chromiumsync.TestServer()
+    http_response, raw_reply = self.server._sync_handler.HandleCommand(
+        raw_request)
     self.send_response(http_response)
     self.end_headers()
     self.wfile.write(raw_reply)
     return True
 
   def MultipartHandler(self):
     """Send a multipart response (10 text/html pages)."""
     test_name = "/multipart"
     if not self._ShouldHandleRequest(test_name):
       return False
@@ skipping 156 matching lines @@
         print 'specified cert file not found: ' + options.cert + ' exiting...'
         return
       server = HTTPSServer(('127.0.0.1', port), TestPageHandler, options.cert)
       print 'HTTPS server started on port %d...' % port
     else:
       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
+    server._sync_handler = None
+
     MakeDumpDir(server.data_dir)
 
   # means FTP Server
   else:
     my_data_dir = MakeDataDir()
 
     def line_logger(msg):
       if (msg.find("kill") >= 0):
         server.stop = True
         print 'shutting down server'
@@ skipping 45 matching lines @@
   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))