Rev 6512: Test socket.error as well. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-conn-reset-socket-pipe-1047325

John Arbash Meinel john at arbash-meinel.com
Mon Sep 10 11:52:07 UTC 2012


At http://bazaar.launchpad.net/~jameinel/bzr/2.5-conn-reset-socket-pipe-1047325

------------------------------------------------------------
revno: 6512
revision-id: john at arbash-meinel.com-20120910115158-v2j9ykqorlpu7qwt
parent: john at arbash-meinel.com-20120910115034-w5vgbm4o3ham01l1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-conn-reset-socket-pipe-1047325
timestamp: Mon 2012-09-10 15:51:58 +0400
message:
  Test socket.error as well.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2012-09-10 11:50:34 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2012-09-10 11:51:58 +0000
@@ -644,8 +644,9 @@
                 pass
         # All of these should be treated as ConnectionReset
         errs = []
-        for errnum in osutils._end_of_stream_errors:
-            errs.append(IOError(errnum))
+        for err_cls in (IOError, socket.error):
+            for errnum in osutils._end_of_stream_errors:
+                errs.append(err_cls(errnum))
         for err in errs:
             sock = DisconnectedSocket(err)
             med = medium.SmartClientAlreadyConnectedSocketMedium('base', sock)



More information about the bazaar-commits mailing list