← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-27 15:58:36 UTC
  • mfrom: (5609.2.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: v.ladeuil+lp@free.fr-20110127155836-hoyxs53z42jh3ezm
Merge 2.3 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import bzrlib.hooks
 
18
from bzrlib import transport
18
19
from bzrlib.tests import features
19
20
 
20
21
# SFTPTransport offers better performances but relies on paramiko, if paramiko
34
35
 
35
36
from bzrlib.transport import (
36
37
    ConnectedTransport,
37
 
    get_transport,
38
38
    register_transport,
39
39
    register_urlparse_netloc_protocol,
40
40
    unregister_transport,
111
111
        # standard test support code will work and permit the server url
112
112
        # correctly.
113
113
        url = self.get_url()
114
 
        t = get_transport(url)
 
114
        t = transport.get_transport(url)
115
115
        if t.base.endswith('work/'):
116
116
            t = t.clone('../..')
117
117
        self.permit_url(t.base)