[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/testing.

[Jim Fulton]

Log message for revision 73326:
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/testing.py
  U   zc.buildout/trunk/src/zc/buildout/testing.txt

-=-
Modified: zc.buildout/trunk/src/zc/buildout/testing.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testing.py	2007-03-18 18:48:41 UTC (rev 73325)
+++ zc.buildout/trunk/src/zc/buildout/testing.py	2007-03-18 18:48:45 UTC (rev 73326)
@@ -242,14 +242,27 @@
 
 class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
 
+    Server.__log = False
+
     def __init__(self, request, address, server):
+        self.__server = server
         self.tree = server.tree
         BaseHTTPServer.BaseHTTPRequestHandler.__init__(
             self, request, address, server)
 
     def do_GET(self):
         if '__stop__' in self.path:
-           raise SystemExit
+            raise SystemExit
+        
+        if self.path == '/enable_server_logging':
+            self.__server.__log = True
+            self.send_response(200)
+            return
+            
+        if self.path == '/disable_server_logging':
+            self.__server.__log = False
+            self.send_response(200)
+            return
 
         path = os.path.abspath(os.path.join(self.tree, *self.path.split('/')))
         if not (
@@ -295,8 +308,9 @@
 
         self.wfile.write(out)
                 
-    def log_request(*s):
-        pass
+    def log_request(self, code):
+        if self.__server.__log:
+            print '%s %s %s' % (self.command, code, self.path)
 
 def _run(tree, port):
     server_address = ('localhost', port)

Modified: zc.buildout/trunk/src/zc/buildout/testing.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testing.txt	2007-03-18 18:48:41 UTC (rev 73325)
+++ zc.buildout/trunk/src/zc/buildout/testing.txt	2007-03-18 18:48:45 UTC (rev 73326)
@@ -90,6 +90,19 @@
     Start a web server on the given path.  The server will be shut
     down at the end of the test.  The server URL is returned.
 
+    You can cause the server to start and stop logging it's output
+    using: 
+
+       >>> get(server_url+'enable_server_logging')
+
+    and:
+
+       >>> get(server_url+'enable_server_logging')
+
+    This can be useful to see how buildout is interacting with a
+    server.
+
+
 ``sdist(setup, dest)``
     Create a source distribution by running the given setup file and
     placing the result in the given destination directory.  If the