← 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: Jelmer Vernooij
  • Date: 2011-08-10 23:27:14 UTC
  • mto: (5268.7.8 transport-segments)
  • mto: This revision was merged to the branch mainline in revision 6062.
  • Revision ID: jelmer@samba.org-20110810232714-ifyj77n3sc251b7f
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
78
78
        # The following is needed to minimize the effects of our trick above
79
79
        # while retaining the best compatibility.
80
80
        self._parsed_url.scheme = _hooked_scheme
81
 
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
 
81
        base = self._unsplit_url(self._parsed_url.scheme,
 
82
                                 self._parsed_url.user,
 
83
                                 self._parsed_url.password,
 
84
                                 self._parsed_url.host, self._parsed_url.port,
 
85
                                 self._parsed_url.path)
 
86
        super(ConnectedTransport, self).__init__(base)
82
87
 
83
88
 
84
89
class ConnectionHookedTransport(InstrumentedTransport):
108
113
        # standard test support code will work and permit the server url
109
114
        # correctly.
110
115
        url = self.get_url()
111
 
        t = transport.get_transport_from_url(url)
 
116
        t = transport.get_transport(url)
112
117
        if t.base.endswith('work/'):
113
118
            t = t.clone('../..')
114
119
        self.permit_url(t.base)