← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
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
from bzrlib.tests import features
18
20
 
19
21
# SFTPTransport offers better performances but relies on paramiko, if paramiko
20
22
# is not available, we fallback to FtpTransport
21
 
from bzrlib.tests import test_sftp_transport
22
 
if test_sftp_transport.paramiko_loaded:
 
23
if features.paramiko.available():
 
24
    from bzrlib.tests import test_sftp_transport
23
25
    from bzrlib.transport import sftp
24
26
    _backing_scheme = 'sftp'
25
27
    _backing_transport_class = sftp.SFTPTransport
45
47
    """Dict-mapping hook name to a list of callables for transport hooks"""
46
48
 
47
49
    def __init__(self):
48
 
        super(TransportHooks, self).__init__()
 
50
        super(TransportHooks, self).__init__("bzrlib.tests.transport_util",
 
51
            "InstrumentedTransport.hooks")
49
52
        # Invoked when the transport has just created a new connection.
50
53
        # The api signature is (transport, connection, credentials)
51
54
        self['_set_connection'] = []
74
77
            fake_base, _from_transport=_from_transport)
75
78
        # The following is needed to minimize the effects of our trick above
76
79
        # while retaining the best compatibility.
77
 
        self._scheme = _hooked_scheme
78
 
        base = self._unsplit_url(self._scheme,
79
 
                                 self._user, self._password,
80
 
                                 self._host, self._port,
81
 
                                 self._path)
82
 
        super(ConnectedTransport, self).__init__(base)
 
80
        self._parsed_url.scheme = _hooked_scheme
 
81
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
83
82
 
84
83
 
85
84
class ConnectionHookedTransport(InstrumentedTransport):
98
97
    def setUp(self):
99
98
        register_urlparse_netloc_protocol(_hooked_scheme)
100
99
        register_transport(_hooked_scheme, ConnectionHookedTransport)
101
 
 
102
 
        def unregister():
103
 
            unregister_transport(_hooked_scheme, ConnectionHookedTransport)
104
 
            _unregister_urlparse_netloc_protocol(_hooked_scheme)
105
 
 
106
 
        self.addCleanup(unregister)
 
100
        self.addCleanup(unregister_transport, _hooked_scheme,
 
101
                        ConnectionHookedTransport)
 
102
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
107
103
        super(TestCaseWithConnectionHookedTransport, self).setUp()
108
104
        self.reset_connections()
 
105
        # Add the 'hooked' url to the permitted url list.
 
106
        # XXX: See TestCase.start_server. This whole module shouldn't need to
 
107
        # exist - a bug has been filed on that. once its cleanedup/removed, the
 
108
        # standard test support code will work and permit the server url
 
109
        # correctly.
 
110
        url = self.get_url()
 
111
        t = transport.get_transport(url)
 
112
        if t.base.endswith('work/'):
 
113
            t = t.clone('../..')
 
114
        self.permit_url(t.base)
109
115
 
110
116
    def get_url(self, relpath=None):
111
117
        super_self = super(TestCaseWithConnectionHookedTransport, self)
116
122
        return url
117
123
 
118
124
    def start_logging_connections(self):
 
125
        self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks())
 
126
        # We preserved the hooks class attribute. Now we install our hook.
119
127
        ConnectionHookedTransport.hooks.install_named_hook(
120
128
            '_set_connection', self._collect_connection, None)
121
 
        # uninstall our hooks when we are finished
122
 
        self.addCleanup(self.reset_hooks)
123
 
 
124
 
    def reset_hooks(self):
125
 
        InstrumentedTransport.hooks = TransportHooks()
126
129
 
127
130
    def reset_connections(self):
128
131
        self.connections = []