← 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: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 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
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):
97
100
    def setUp(self):
98
101
        register_urlparse_netloc_protocol(_hooked_scheme)
99
102
        register_transport(_hooked_scheme, ConnectionHookedTransport)
100
 
        self.addCleanup(unregister_transport, _hooked_scheme,
101
 
                        ConnectionHookedTransport)
102
 
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
 
103
 
 
104
        def unregister():
 
105
            unregister_transport(_hooked_scheme, ConnectionHookedTransport)
 
106
            _unregister_urlparse_netloc_protocol(_hooked_scheme)
 
107
 
 
108
        self.addCleanup(unregister)
103
109
        super(TestCaseWithConnectionHookedTransport, self).setUp()
104
110
        self.reset_connections()
105
111
        # Add the 'hooked' url to the permitted url list.
108
114
        # standard test support code will work and permit the server url
109
115
        # correctly.
110
116
        url = self.get_url()
111
 
        t = transport.get_transport(url)
 
117
        t = get_transport(url)
112
118
        if t.base.endswith('work/'):
113
119
            t = t.clone('../..')
114
120
        self.permit_url(t.base)
122
128
        return url
123
129
 
124
130
    def start_logging_connections(self):
125
 
        self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks())
126
 
        # We preserved the hooks class attribute. Now we install our hook.
127
131
        ConnectionHookedTransport.hooks.install_named_hook(
128
132
            '_set_connection', self._collect_connection, None)
 
133
        # uninstall our hooks when we are finished
 
134
        self.addCleanup(self.reset_hooks)
 
135
 
 
136
    def reset_hooks(self):
 
137
        InstrumentedTransport.hooks = TransportHooks()
129
138
 
130
139
    def reset_connections(self):
131
140
        self.connections = []