Rev 4629: Fix test failure by catching an error raised by newer pycurls. in file:///home/vila/src/bzr/bugs/306264-pycurl-recv-error/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/306264-pycurl-recv-error/

------------------------------------------------------------
revno: 4629
revision-id: v.ladeuil+lp at free.fr-20090819093407-t3bk5g5dn8cn8qjc
parent: pqm at pqm.ubuntu.com-20090819030231-xjwlii48wpfy8qui
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 306264-pycurl-recv-error
timestamp: Wed 2009-08-19 11:34:07 +0200
message:
  Fix test failure by catching an error raised by newer pycurls.
  
  * bzrlib/transport/http/_pycurl.py:
  (CURLE_RECV_ERROR): New error code.
  (PyCurlTransport._curl_perform): CURLE_RECV_ERROR can be raised
  when connections are abruptly closed.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-08-18 20:05:30 +0000
+++ b/NEWS	2009-08-19 09:34:07 +0000
@@ -12,6 +12,10 @@
 Bug Fixes
 *********
 
+* Fix a pycurl related test failure on karmic by recognizing an error
+  raised by newer versions of pycurl.
+  (Vincent Ladeuil, #306264)
+
 * Fix a test failure on karmic by making a locale test more robust.
   (Vincent Ladeuil, #413514)
 

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/transport/http/_pycurl.py	2009-08-19 09:34:07 +0000
@@ -92,6 +92,7 @@
 CURLE_GOT_NOTHING = _get_pycurl_errcode('E_GOT_NOTHING', 52)
 CURLE_PARTIAL_FILE = _get_pycurl_errcode('E_PARTIAL_FILE', 18)
 CURLE_SEND_ERROR = _get_pycurl_errcode('E_SEND_ERROR', 55)
+CURLE_RECV_ERROR = _get_pycurl_errcode('E_RECV_ERROR', 56)
 CURLE_SSL_CACERT = _get_pycurl_errcode('E_SSL_CACERT', 60)
 CURLE_SSL_CACERT_BADFILE = _get_pycurl_errcode('E_SSL_CACERT_BADFILE', 77)
 
@@ -362,6 +363,7 @@
                         CURLE_COULDNT_RESOLVE_PROXY,
                         CURLE_COULDNT_CONNECT,
                         CURLE_GOT_NOTHING,
+                        CURLE_RECV_ERROR,
                         CURLE_SSL_CACERT,
                         CURLE_SSL_CACERT_BADFILE,
                         ):