[Inteproxy-commits] r187 - in trunk: . test

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-03-11 18:24:39 +0100 (Wed, 11 Mar 2009)
New Revision: 187

Modified:
   trunk/ChangeLog
   trunk/test/test_inteproxy.py
Log:
* test/test_inteproxy.py: Doc-string and minor formatting fixes


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-11 17:11:08 UTC (rev 186)
+++ trunk/ChangeLog	2009-03-11 17:24:39 UTC (rev 187)
@@ -1,5 +1,9 @@
 2009-03-11  Bernhard Herzog  <bh at intevation.de>
 
+	* test/test_inteproxy.py: Doc-string and minor formatting fixes
+
+2009-03-11  Bernhard Herzog  <bh at intevation.de>
+
 	Better logging of httplib debug output:
 
 	* inteproxy/main.py (DebugLogOut): Helper class to redirect

Modified: trunk/test/test_inteproxy.py
===================================================================
--- trunk/test/test_inteproxy.py	2009-03-11 17:11:08 UTC (rev 186)
+++ trunk/test/test_inteproxy.py	2009-03-11 17:24:39 UTC (rev 187)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -72,14 +72,16 @@
 
     def create_http_proxy(self):
         """Override in derived classes to create a proxy upstream from inteproxy
-        The method should return the proxy server object object.
+
+        The method should return a tuple with the proxy server object
+        and the username and password for authentications against the
+        proxy.
         """
         return None, None, None
 
     def tearDown(self):
         try:
-            for server in [self.remote_server, self.http_proxy,
-                           self.server]:
+            for server in [self.remote_server, self.http_proxy, self.server]:
                 if server is not None:
                     server.stop()
         finally: