Clean up code duplication in layout test http_server.py

tools/python/google/httpd_utils.py

 #!/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 a local apache http server."""
 
 import logging
 import optparse
 import os
 import subprocess
 import sys
 import time
 import urllib
 
 import google.path_utils
 import google.platform_utils
 
 class HttpdNotStarted(Exception): pass
 
+def UrlIsAlive(url):
+  """Checks to see if we get an http response from |url|.
+  We poll the url 5 times with a 1 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.
+  """
+  wait_time = 5
+  while wait_time > 0:
+    try:
+      response = urllib.urlopen(url)
+      # Server is up and responding.
+      return True
+    except IOError:
+      pass
+    wait_time -= 1
+    # Wait a second and try again.
+    time.sleep(1)
+
+  return False
+
 def ApacheConfigDir(start_dir):
   """Returns a path to the directory holding the Apache config files."""
   return google.path_utils.FindUpward(start_dir, 'tools', 'python',
                                       'google', 'httpd_config')
 
 
 def GetCygserverPath(start_dir, apache2=False):
   """Returns the path to the directory holding cygserver.exe file."""
   cygserver_path = None
   if apache2:
@@ skipping 84 matching lines @@
       cygbin = google.path_utils.FindUpward(cygserver_exe, 'third_party',
                                             'cygwin', 'bin')
       env = os.environ
       env['PATH'] += ";" + cygbin
       subprocess.Popen(cygserver_exe, env=env)
     logging.info('Starting http server')
     self._http_server_proc = subprocess.Popen(self._start_command)
 
     # Ensure that the server is running on all the desired ports.
     for port in self._port_list:
-      if not self._UrlIsAlive('http://127.0.0.1:%s/' % str(port)):
+      if not UrlIsAlive('http://127.0.0.1:%s/' % str(port)):
         raise HttpdNotStarted('Failed to start httpd on port %s' % str(port))
 
-  def _UrlIsAlive(self, url):
-    """Checks to see if we get an http response from |url|.
-    We poll the url 5 times with a 1 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.
-    """
-    wait_time = 5
-    while wait_time > 0:
-      try:
-        response = urllib.urlopen(url)
-        # Server is up and responding.
-        return True
-      except IOError:
-        pass
-      wait_time -= 1
-      # Wait a second and try again.
-      time.sleep(1)
-
-    return False
-
   def StopServer(self, force=False):
     """If we started an httpd.exe process, or if force is True, call
     self._stop_command (passed in on init so it can be platform-dependent).
     This will presumably kill it, and may also kill any other httpd.exe
     processes that are running.
     """
     if force or self._http_server_proc:
       logging.info('Stopping http server')
       kill_proc = subprocess.Popen(self._stop_command,
                                    stdout=subprocess.PIPE,
@@ skipping 24 matching lines @@
 
   document_root = None
   if options.root:
     document_root = options.root
 
   if 'start' == options.server:
     StartServer(document_root, apache2=options.apache2)
   else:
     StopServers(apache2=options.apache2)