← 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: Canonical.com Patch Queue Manager
  • Date: 2010-05-11 11:47:36 UTC
  • mfrom: (5200.3.8 lock_return)
  • Revision ID: pqm@pqm.ubuntu.com-20100511114736-mc1sq9zyo3vufec7
(lifeless) Provide a consistent interface to Tree, Branch,
 Repository where lock methods return an object with an unlock method to
 unlock the lock. This breaks the API for Branch,
 Repository on their lock_write methods. (Robert Collins)

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
19
18
from bzrlib.tests import features
20
19
 
21
20
# SFTPTransport offers better performances but relies on paramiko, if paramiko
35
34
 
36
35
from bzrlib.transport import (
37
36
    ConnectedTransport,
 
37
    get_transport,
38
38
    register_transport,
39
39
    register_urlparse_netloc_protocol,
40
40
    unregister_transport,
47
47
    """Dict-mapping hook name to a list of callables for transport hooks"""
48
48
 
49
49
    def __init__(self):
50
 
        super(TransportHooks, self).__init__("bzrlib.tests.transport_util",
51
 
            "InstrumentedTransport.hooks")
 
50
        super(TransportHooks, self).__init__()
52
51
        # Invoked when the transport has just created a new connection.
53
52
        # The api signature is (transport, connection, credentials)
54
53
        self['_set_connection'] = []
77
76
            fake_base, _from_transport=_from_transport)
78
77
        # The following is needed to minimize the effects of our trick above
79
78
        # while retaining the best compatibility.
80
 
        self._parsed_url.scheme = _hooked_scheme
81
 
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
 
79
        self._scheme = _hooked_scheme
 
80
        base = self._unsplit_url(self._scheme,
 
81
                                 self._user, self._password,
 
82
                                 self._host, self._port,
 
83
                                 self._path)
 
84
        super(ConnectedTransport, self).__init__(base)
82
85
 
83
86
 
84
87
class ConnectionHookedTransport(InstrumentedTransport):
108
111
        # standard test support code will work and permit the server url
109
112
        # correctly.
110
113
        url = self.get_url()
111
 
        t = transport.get_transport_from_url(url)
 
114
        t = get_transport(url)
112
115
        if t.base.endswith('work/'):
113
116
            t = t.clone('../..')
114
117
        self.permit_url(t.base)