diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 18:03:07 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 18:03:07 +0000 |
| commit | 3119ce5077642340b0815e7d57170f92db5df53c (patch) | |
| tree | 6ede2009bb8e59851b8675338e95abdfa4216c64 | |
| parent | 136152270f3344c1da4d7cff2b25cc93911128e4 (diff) | |
| download | chromium_src-3119ce5077642340b0815e7d57170f92db5df53c.zip chromium_src-3119ce5077642340b0815e7d57170f92db5df53c.tar.gz chromium_src-3119ce5077642340b0815e7d57170f92db5df53c.tar.bz2 | |
Add a bit more logging in the hopes of identifying what's going wrong
on the linux bots starting up Apache.
Review URL: http://codereview.chromium.org/487010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34259 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/apache_http_server.py | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/http_server_base.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/layout_package/apache_http_server.py b/webkit/tools/layout_tests/layout_package/apache_http_server.py index 7020be6..8b75872 100644 --- a/webkit/tools/layout_tests/layout_package/apache_http_server.py +++ b/webkit/tools/layout_tests/layout_package/apache_http_server.py @@ -26,6 +26,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase): self.mappings = [ {'port': 8000}, {'port': 8080}, + {'port': 8081}, {'port': 8443, 'sslcert': True} ] @@ -108,6 +109,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase): logging.debug("Starting apache http server") server_started = self.WaitForAction(self._StartHttpdProcess) if server_started: + logging.debug("Apache started. Testing ports") server_started = self.WaitForAction(self.IsServerRunningOnAllPorts) if server_started: diff --git a/webkit/tools/layout_tests/layout_package/http_server_base.py b/webkit/tools/layout_tests/layout_package/http_server_base.py index d4a5f59..91d98ea 100644 --- a/webkit/tools/layout_tests/layout_package/http_server_base.py +++ b/webkit/tools/layout_tests/layout_package/http_server_base.py @@ -4,6 +4,7 @@ """Base class with common routines between the Apache and Lighttpd servers.""" +import logging import time import urllib @@ -31,8 +32,9 @@ class HttpServerBase(object): try: response = urllib.urlopen(url) - # Server is up and responding. + logging.debug("Server running at %s" % url) except IOError: + logging.debug("Server NOT running at %s" % url) return False return True |