Merge lp:~vila/bzr/1645017-pycurl-proxy-tests into lp:bzr/2.7
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6620 |
Proposed branch: | lp:~vila/bzr/1645017-pycurl-proxy-tests |
Merge into: | lp:bzr/2.7 |
Diff against target: |
102 lines (+48/-1) 3 files modified
bzrlib/tests/test_http.py (+6/-1) bzrlib/transport/http/_pycurl.py (+4/-0) doc/en/release-notes/bzr-2.7.txt (+38/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/1645017-pycurl-proxy-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+314783@code.launchpad.net |
Commit message
Fix pycurl proxy tests for newer and stricter pycurl versions.
Description of the change
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.
To post a comment you must log in.
This should probably also go into bzr.dev