← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-15 20:38:48 UTC
  • mfrom: (6615.3.5 merges)
  • mto: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170115203848-uydcme4tuuqg9ku5
Merge 2.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
1
 
# Copyright (C) 2005-2012, 2015, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2015, 2016, 2017 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1283
1283
            self.no_proxy_host = self.server_host_port
1284
1284
        # The secondary server is the proxy
1285
1285
        self.proxy_url = self.get_secondary_url()
 
1286
        if self._testing_pycurl():
 
1287
            self.proxy_url = self.proxy_url.replace('+pycurl', '')
1286
1288
 
1287
1289
    def _testing_pycurl(self):
1288
1290
        # TODO: This is duplicated for lots of the classes in this file
1863
1865
                                  ])
1864
1866
 
1865
1867
    def get_user_transport(self, user, password):
1866
 
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
 
1868
        proxy_url = self.get_user_url(user, password)
 
1869
        if self._testing_pycurl():
 
1870
            proxy_url = proxy_url.replace('+pycurl', '')
 
1871
        self.overrideEnv('all_proxy', proxy_url)
1867
1872
        return TestAuth.get_user_transport(self, user, password)
1868
1873
 
1869
1874
    def test_empty_pass(self):