Rev 3751: Fix test suite regression on OSX. in http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

------------------------------------------------------------
revno: 3751
revision-id: v.ladeuil+lp at free.fr-20080930063313-qoc0otudltcy9idv
parent: pqm at pqm.ubuntu.com-20080929054234-s2ajcaxxm75errlz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Tue 2008-09-30 08:33:13 +0200
message:
  Fix test suite regression on OSX.
  
  * bzrlib/smart/message.py:
  (ConventionalResponseHandler._read_more): Connection reset can
  occur very early.
-------------- next part --------------
=== modified file 'bzrlib/smart/message.py'
--- a/bzrlib/smart/message.py	2008-09-17 07:18:20 +0000
+++ b/bzrlib/smart/message.py	2008-09-30 06:33:13 +0000
@@ -16,6 +16,8 @@
 
 import collections
 from cStringIO import StringIO
+import errno
+import socket
 
 from bzrlib import (
     debug,
@@ -234,7 +236,13 @@
             self.finished_reading = True
             self._medium_request.finished_reading()
             return
-        bytes = self._medium_request.read_bytes(next_read_size)
+        try:
+            bytes = self._medium_request.read_bytes(next_read_size)
+        except socket.error, e:
+            if len(e.args) and e.args[0] is errno.ECONNRESET:
+                bytes = ''
+            else:
+                raise
         if bytes == '':
             # end of file encountered reading from server
             if 'hpss' in debug.debug_flags: