/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_server.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-11 11:01:30 UTC
  • mto: (5247.4.11 sftp-leaks)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20100611110130-417cx9q4qecsidgc
Fix weong conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
376
376
                self.handle_error(request, client_address)
377
377
                self.close_request(request)
378
378
 
379
 
    def handle_request(self):
380
 
        """Handle one request.
381
 
 
382
 
        The python version swallows some socket exceptions and we don't use
383
 
        timeout, so we override to better control the server behavior.
384
 
        """
385
 
        request, client_address = self.get_request()
386
 
        if self.verify_request(request, client_address):
387
 
            try:
388
 
                self.process_request(request, client_address)
389
 
            except:
390
 
                self.handle_error(request, client_address)
391
 
                self.close_request(request)
392
 
 
393
379
    def verify_request(self, request, client_address):
394
380
        """Verify the request.
395
381