Merge lp:~vila/bzr/306264-pycurl-recv-error into lp:~bzr/bzr/trunk-old

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

I was finally able to reproduce the (reported long ago) problem with newer pycurl.

The priority was low because that occured only in torture tests. Yet, it was causing failures on karmic recently.

Hopefully we'll have a clean selftest run now, which makes me quite warmer inside
with 2.0 across the corner :-)

[Vincent Ladeuil (vila)]

There are more cases than are closely related and need additional fixing.

review: Needs Resubmitting

[Vincent Ladeuil (vila)]

So this new fix is more complete as it turns out that the error should be turned into
a ConnectionReset instead.

And doing so, some minor tweaks are needed but more importantly it also address a rarely seen
problem in the urllib implementation.

[Robert Collins (lifeless)]

review +1

=== modified file 'NEWS'
--- NEWS	2009-08-19 18:04:49 +0000
+++ NEWS	2009-08-20 02:35:11 +0000
@@ -9,6 +9,29 @@
 In Development
 ##############
 
+<<<<<<< TREE
+=======
+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)
+
+Improvements
+************
+
+* A better description of the platform is shown in crash tracebacks, ``bzr
+  --version`` and ``bzr selftest``.
+  (Martin Pool, #409137)
+
+bzr 1.18
+########
+
+>>>>>>> MERGE-SOURCE
 Compatibility Breaks
 ********************
 

=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py	2009-06-10 03:56:49 +0000
+++ bzrlib/tests/test_http.py	2009-08-20 02:35:12 +0000
@@ -625,14 +625,17 @@
         # for details) make no distinction between a closed
         # socket and badly formatted status line, so we can't
         # just test for ConnectionError, we have to test
-        # InvalidHttpResponse too.
-        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
+        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
+        # instead of ConnectionError too.
+        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
+                            errors.InvalidHttpResponse),
                           t.has, 'foo/bar')
 
     def test_http_get(self):
         server = self.get_readonly_server()
         t = self._transport(server.get_url())
-        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
+        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
+                           errors.InvalidHttpResponse),
                           t.get, 'foo/bar')
 
 

=== modified file 'bzrlib/transport/http/__init__.py'
--- bzrlib/transport/http/__init__.py	2009-04-27 03:27:46 +0000
+++ bzrlib/transport/http/__init__.py	2009-08-20 02:35:12 +0000
@@ -617,7 +617,7 @@
                 raise InvalidHttpResponse(
                     t._remote_path('.bzr/smart'),
                     'Expected 200 response code, got %r' % (code,))
-        except errors.InvalidHttpResponse, e:
+        except (errors.InvalidHttpResponse, errors.ConnectionReset), e:
             raise errors.SmartProtocolError(str(e))
         return body_filelike
 

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- bzrlib/transport/http/_pycurl.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/http/_pycurl.py	2009-08-20 02:35:12 +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)
 
@@ -367,6 +368,9 @@
                         ):
                 raise errors.ConnectionError(
                     'curl connection error (%s)\non %s' % (e[1], url))
+            elif e[0] == CURLE_RECV_ERROR:
+                raise errors.ConnectionReset(
+                    'curl connection error (%s)\non %s' % (e[1], url))
             elif e[0] == CURLE_PARTIAL_FILE:
                 # Pycurl itself has detected a short read.  We do not have all
                 # the information for the ShortReadvError, but that should be

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2009-05-04 15:21:26 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2009-08-20 02:35:12 +0000
@@ -46,6 +46,7 @@
 # actual code more or less do that, tests should be written to
 # ensure that.
 
+import errno
 import httplib
 try:
     import kerberos
@@ -541,6 +542,10 @@
                         request.get_full_url(),
                         'Bad status line received',
                         orig_error=exc_val)
+                elif (isinstance(exc_val, socket.error) and len(exc_val.args)
+                      and exc_val.args[0] in (errno.ECONNRESET, 10054)):
+                    raise errors.ConnectionReset(
+                        "Connection lost while sending request.")
                 else:
                     # All other exception are considered connection related.