Merge lp:~vila/bzr/1645017-pycurl-proxy-tests into lp:bzr/2.7

[Vincent Ladeuil]

Fix pycurl proxy tests for newer and stricter pycurl versions.

This fixes the test failures starting with recent version of pycurl becoming stricter about the accepted proxy urls.

Using 'http+pycurl:' is not allowed anymore and should just be 'http:'

Only tests are affected.

[Jelmer Vernooij (jelmer)]

This should probably also go into bzr.dev

review: Approve

[Vincent Ladeuil (vila)]

> This should probably also go into bzr.dev

/me nods

=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py	2016-09-09 12:59:40 +0000
+++ bzrlib/tests/test_http.py	2017-01-15 18:54:57 +0000
@@ -1283,6 +1283,8 @@
             self.no_proxy_host = self.server_host_port
         # The secondary server is the proxy
         self.proxy_url = self.get_secondary_url()
+        if self._testing_pycurl():
+            self.proxy_url = self.proxy_url.replace('+pycurl', '')
 
     def _testing_pycurl(self):
         # TODO: This is duplicated for lots of the classes in this file
@@ -1863,7 +1865,10 @@
                                   ])
 
     def get_user_transport(self, user, password):
-        self.overrideEnv('all_proxy', self.get_user_url(user, password))
+        proxy_url = self.get_user_url(user, password)
+        if self._testing_pycurl():
+            proxy_url = proxy_url.replace('+pycurl', '')
+        self.overrideEnv('all_proxy', proxy_url)
         return TestAuth.get_user_transport(self, user, password)
 
     def test_empty_pass(self):
 
=== modified file 'bzrlib/transport/http/_pycurl.py'
--- bzrlib/transport/http/_pycurl.py	2011-12-19 13:23:58 +0000
+++ bzrlib/transport/http/_pycurl.py	2017-01-15 18:54:57 +0000
@@ -85,6 +85,9 @@
     """
     return pycurl.__dict__.get(symbol, default)
 
+# Yes, weird but returned on weird http error (invalid status line)
+CURLE_FTP_WEIRD_SERVER_REPLY = _get_pycurl_errcode(
+    'E_FTP_WEIRD_SERVER_REPLY', 8)
 CURLE_COULDNT_CONNECT = _get_pycurl_errcode('E_COULDNT_CONNECT', 7)
 CURLE_COULDNT_RESOLVE_HOST = _get_pycurl_errcode('E_COULDNT_RESOLVE_HOST', 6)
 CURLE_COULDNT_RESOLVE_PROXY = _get_pycurl_errcode('E_COULDNT_RESOLVE_PROXY', 5)
@@ -397,6 +400,7 @@
             if e[0] in (CURLE_COULDNT_RESOLVE_HOST,
                         CURLE_COULDNT_RESOLVE_PROXY,
                         CURLE_COULDNT_CONNECT,
+                        CURLE_FTP_WEIRD_SERVER_REPLY,
                         CURLE_GOT_NOTHING,
                         CURLE_SSL_CACERT,
                         CURLE_SSL_CACERT_BADFILE,
 
=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- doc/en/release-notes/bzr-2.7.txt	2017-01-15 18:18:01 +0000
+++ doc/en/release-notes/bzr-2.7.txt	2017-01-15 18:54:57 +0000
@@ -11,6 +11,22 @@
 :2.7.1: NOT RELEASED YET
 
 
+External Compatibility Breaks
+*****************************
+
+None.
+
+New Features
+************
+
+None.
+
+Improvements
+************
+
+None.
+
+
 Bug Fixes
 *********
 
@@ -22,6 +38,28 @@
 
 * Clarify pypi uploads for releases. (Vincent Ladeuil, #1542903)
 
+API Changes
+***********
+
+None.
+
+Internals
+*********
+
+None.
+
+Changed Behaviour
+*****************
+
+None.
+
+Testing
+*******
+
+* Recent versions of pycurl started being stricter about the proxy url,
+  using 'http+pycurl:' is not allowed anymore and should just be 'http:'
+  (Vincent Ladeuil, #1645017).
+
 
 bzr 2.7.0
 #########