Clean up code duplication in layout test http_server.py

webkit/tools/layout_tests/layout_package/http_server.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 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.
 
 """A class to help start/stop the lighttpd server used by layout tests."""
 
 
 import logging
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 import urllib
 
 import path_utils
+import google.httpd_utils
 
 def RemoveLogFiles(folder, starts_with):
   files = os.listdir(folder)
   for file in files:
     if file.startswith(starts_with) :
       full_path = os.path.join(folder, file)
       os.remove(full_path)
 
-class HttpdNotStarted(Exception):
-  pass
-
 class Lighttpd:
   # Webkit tests
   try:
     _webkit_tests = path_utils.PathFromBase('third_party', 'WebKit',
                                             'LayoutTests', 'http', 'tests')
     _js_test_resource = path_utils.PathFromBase('third_party', 'WebKit',
                                                 'LayoutTests', 'fast',
                                                 'js', 'resources')
   except path_utils.PathNotFound:
     # If third_party/WebKit/LayoutTests/http/tests does not exist, assume wekit
@@ skipping 172 matching lines @@
     logging.info('Starting http server')
     self._process = subprocess.Popen(start_cmd, env=env)
 
     # Wait for server to start.
     time.sleep(3)
 
     # Ensure that the server is running on all the desired ports.
     for mapping in mappings:
       url = 'http%s://127.0.0.1:%d/' % ('sslcert' in mapping and 's' or '',
                                         mapping['port'])
-      if not self._UrlIsAlive(url):
-        raise HttpdNotStarted('Failed to start httpd on port %s' %
-                              str(mapping['port']))
+      if not google.httpd_utils.UrlIsAlive(url):
+        raise google.httpd_utils.HttpdNotStarted('Failed to start httpd on ',
+                                                 'port %s' %
+                                                 str(mapping['port']))
 
     # Our process terminated already
     if self._process.returncode != None:
-      raise HttpdNotStarted('Failed to start httpd.')
-
-  def _UrlIsAlive(self, url):
-    """Checks to see if we get an http response from |url|.
-    We poll the url 5 times with a 3 second delay.  If we don't
-    get a reply in that time, we give up and assume the httpd
-    didn't start properly.
-
-    Args:
-      url: The URL to check.
-    Return:
-      True if the url is alive.
-    """
-    attempts = 5
-    while attempts > 0:
-      try:
-        response = urllib.urlopen(url)
-        # Server is up and responding.
-        return True
-      except IOError:
-        pass
-      attempts -= 1
-      # Wait 3 seconds and try again.
-      time.sleep(3)
-
-    return False
+      raise google.httpd_utils.HttpdNotStarted('Failed to start httpd.')
 
   # TODO(deanm): Find a nicer way to shutdown cleanly.  Our log files are
   # probably not being flushed, etc... why doesn't our python have os.kill ?
   def Stop(self, force=False):
     if not force and not self.IsRunning():
       return
 
     logging.info('Shutting down http server')
     path_utils.ShutDownHTTPServer(self._process)
 
@@ skipping 31 matching lines @@
       raise 'Specifying port requires also a root.'
     httpd = Lighttpd(tempfile.gettempdir(),
                      port=options.port,
                      root=options.root,
                      register_cygwin=options.register_cygwin,
                      run_background=options.run_background)
     if 'start' == options.server:
       httpd.Start()
     else:
       httpd.Stop(force=True)