Rev 3135: Cleanups. in file:///v/home/vila/src/bzr/bugs/175524/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/175524/

------------------------------------------------------------
revno: 3135
revision-id:v.ladeuil+lp at free.fr-20071224132930-on2606aabyvv5mjj
parent: v.ladeuil+lp at free.fr-20071224103124-oojmi9jenve9irat
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 14:29:30 +0100
message:
  Cleanups.
  
  * bzrlib/tests/test_http.py:
  (load_tests): Make it clearer that we are using test classes.
modified:
  bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2007-12-24 10:31:24 +0000
+++ b/bzrlib/tests/http_server.py	2007-12-24 13:29:30 +0000
@@ -14,7 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import BaseHTTPServer
 import errno
 import httplib
 import os
@@ -51,12 +50,12 @@
     TCPServer class, for the HTTP server it is really a connection which itself
     will handle one or several HTTP requests.
     """
+    # Default protocol version
+    protocol_version = 'HTTP/1.1'
+
     # The Message-like class used to parse the request headers
     MessageClass = httplib.HTTPMessage
 
-    # Default protocol version
-    protocol_version = 'HTTP/1.1'
-
     def setup(self):
         SimpleHTTPServer.SimpleHTTPRequestHandler.setup(self)
         tcs = self.server.test_case_server
@@ -82,8 +81,8 @@
         try:
             SimpleHTTPServer.SimpleHTTPRequestHandler.handle_one_request(self)
         except socket.error, e:
-            # Any socket error should close the connection, but some are due to
-            # the client closing early and we don't want to pollute test
+            # Any socket error should close the connection, but some errors are
+            # due to the client closing early and we don't want to pollute test
             # results, so we raise only the others.
             self.close_connection = 1
             if (len(e.args) == 0

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2007-12-23 17:48:27 +0000
+++ b/bzrlib/tests/test_http.py	2007-12-24 13:29:30 +0000
@@ -139,18 +139,18 @@
     is_also_testing_for_authentication = tests.condition_isinstance(tpa_classes)
 
     result = loader.suiteClass()
-    for test in tests.iter_suite_tests(standard_tests):
+    for test_class in tests.iter_suite_tests(standard_tests):
         # Each test class is either standalone or testing for some combination
         # of transport, protocol version, authentication scheme. Use the right
         # adpater (or none) depending on the class.
-        if is_testing_for_transports(test):
-            result.addTests(t_adapter.adapt(test))
-        elif is_also_testing_for_protocols(test):
-            result.addTests(tp_adapter.adapt(test))
-        elif is_also_testing_for_authentication(test):
-            result.addTests(tpa_adapter.adapt(test))
+        if is_testing_for_transports(test_class):
+            result.addTests(t_adapter.adapt(test_class))
+        elif is_also_testing_for_protocols(test_class):
+            result.addTests(tp_adapter.adapt(test_class))
+        elif is_also_testing_for_authentication(test_class):
+            result.addTests(tpa_adapter.adapt(test_class))
         else:
-            result.addTest(test)
+            result.addTest(test_class)
     return result
 
 

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2007-12-21 21:58:06 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2007-12-24 13:29:30 +0000
@@ -145,9 +145,9 @@
                 pending += len(data)
             if pending:
                 trace.mutter(
-                    # FIXME: this message is bogus if the server didn't give the
-                    # length, there is no way we can know how many bytes are
-                    # left !
+                    # FIXME: this message is bogus if the server didn't give
+                    # the length, there is no way we can know how many bytes
+                    # are left !
                     "bogus http server didn't give body length,"
                     "%s bytes left on the socket",
                     pending)
@@ -181,7 +181,7 @@
         return self._response
 
     def cleanup_pipe(self):
-        """Make the connection believe the response has been fully processed."""
+        """Read the remaining bytes of the last response if any."""
         if self._response is not None:
             pending = self._response.finish()
             # Warn the user (once)