Rev 5281: Fix weong conflict resolution. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5281
revision-id: v.ladeuil+lp at free.fr-20100611110130-417cx9q4qecsidgc
parent: v.ladeuil+lp at free.fr-20100611105955-boej0be89z295r95
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Fri 2010-06-11 13:01:30 +0200
message:
  Fix weong conflict resolution.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-07 17:07:05 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-11 11:01:30 +0000
@@ -376,20 +376,6 @@
                 self.handle_error(request, client_address)
                 self.close_request(request)
 
-    def handle_request(self):
-        """Handle one request.
-
-        The python version swallows some socket exceptions and we don't use
-        timeout, so we override to better control the server behavior.
-        """
-        request, client_address = self.get_request()
-        if self.verify_request(request, client_address):
-            try:
-                self.process_request(request, client_address)
-            except:
-                self.handle_error(request, client_address)
-                self.close_request(request)
-
     def verify_request(self, request, client_address):
         """Verify the request.