/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

Spurious debug statement deleted.

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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import bzrlib.hooks
18
 
from bzrlib.tests import features
19
18
 
20
19
# SFTPTransport offers better performances but relies on paramiko, if paramiko
21
20
# is not available, we fallback to FtpTransport
22
 
if features.paramiko.available():
23
 
    from bzrlib.tests import test_sftp_transport
 
21
from bzrlib.tests import test_sftp_transport
 
22
if test_sftp_transport.paramiko_loaded:
24
23
    from bzrlib.transport import sftp
25
 
    _backing_scheme = 'sftp'
26
24
    _backing_transport_class = sftp.SFTPTransport
27
25
    _backing_test_class = test_sftp_transport.TestCaseWithSFTPServer
28
26
else:
29
27
    from bzrlib.transport import ftp
30
28
    from bzrlib.tests import test_ftp_transport
31
 
    _backing_scheme = 'ftp'
32
29
    _backing_transport_class = ftp.FtpTransport
33
30
    _backing_test_class = test_ftp_transport.TestCaseWithFTPServer
34
31
 
35
32
from bzrlib.transport import (
36
 
    ConnectedTransport,
37
 
    get_transport,
38
33
    register_transport,
39
34
    register_urlparse_netloc_protocol,
40
35
    unregister_transport,
54
49
 
55
50
_hooked_scheme = 'hooked'
56
51
 
57
 
def _change_scheme_in(url, actual, desired):
58
 
    if not url.startswith(actual + '://'):
59
 
        raise AssertionError('url "%r" does not start with "%r]"'
60
 
                             % (url, actual))
61
 
    return desired + url[len(actual):]
62
 
 
63
 
 
64
52
class InstrumentedTransport(_backing_transport_class):
65
53
    """Instrumented transport class to test commands behavior"""
66
54
 
67
55
    hooks = TransportHooks()
68
56
 
69
57
    def __init__(self, base, _from_transport=None):
70
 
        if not base.startswith(_hooked_scheme + '://'):
71
 
            raise ValueError(base)
72
 
        # We need to trick the backing transport class about the scheme used
73
 
        # We'll do the reverse when we need to talk to the backing server
74
 
        fake_base = _change_scheme_in(base, _hooked_scheme, _backing_scheme)
75
 
        super(InstrumentedTransport, self).__init__(
76
 
            fake_base, _from_transport=_from_transport)
77
 
        # The following is needed to minimize the effects of our trick above
78
 
        # while retaining the best compatibility.
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)
 
58
        assert base.startswith(_hooked_scheme + '://')
 
59
        # Both backing transports classes will choke on our specific scheme,
 
60
        # let's short-circuit them
 
61
        super_self = super(_backing_transport_class, self)
 
62
        super_self.__init__(base, _from_transport=_from_transport)
85
63
 
86
64
 
87
65
class ConnectionHookedTransport(InstrumentedTransport):
100
78
    def setUp(self):
101
79
        register_urlparse_netloc_protocol(_hooked_scheme)
102
80
        register_transport(_hooked_scheme, ConnectionHookedTransport)
103
 
        self.addCleanup(unregister_transport, _hooked_scheme,
104
 
                        ConnectionHookedTransport)
105
 
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
 
81
 
 
82
        def unregister():
 
83
            unregister_transport(_hooked_scheme, ConnectionHookedTransport)
 
84
            _unregister_urlparse_netloc_protocol(_hooked_scheme)
 
85
 
 
86
        self.addCleanup(unregister)
106
87
        super(TestCaseWithConnectionHookedTransport, self).setUp()
107
88
        self.reset_connections()
108
 
        # Add the 'hooked' url to the permitted url list.
109
 
        # XXX: See TestCase.start_server. This whole module shouldn't need to
110
 
        # exist - a bug has been filed on that. once its cleanedup/removed, the
111
 
        # standard test support code will work and permit the server url
112
 
        # correctly.
113
 
        url = self.get_url()
114
 
        t = get_transport(url)
115
 
        if t.base.endswith('work/'):
116
 
            t = t.clone('../..')
117
 
        self.permit_url(t.base)
118
89
 
119
90
    def get_url(self, relpath=None):
120
91
        super_self = super(TestCaseWithConnectionHookedTransport, self)
121
92
        url = super_self.get_url(relpath)
122
 
        # Replace the backing scheme by our own (see
123
 
        # InstrumentedTransport.__init__)
124
 
        url = _change_scheme_in(url, _backing_scheme, _hooked_scheme)
 
93
        # Replace the sftp scheme by our own
 
94
        url = _hooked_scheme + url[len('sftp'):]
125
95
        return url
126
96
 
127
 
    def start_logging_connections(self):
128
 
        self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks())
129
 
        # We preserved the hooks class attribute. Now we install our hook.
130
 
        ConnectionHookedTransport.hooks.install_named_hook(
131
 
            '_set_connection', self._collect_connection, None)
 
97
    def install_hooks(self):
 
98
        ConnectionHookedTransport.hooks.install_hook('_set_connection',
 
99
                                                     self.set_connection_hook)
 
100
        # uninstall our hooks when we are finished
 
101
        self.addCleanup(self.reset_hooks)
 
102
 
 
103
    def reset_hooks(self):
 
104
        InstrumentedTransport.hooks = TransportHooks()
132
105
 
133
106
    def reset_connections(self):
134
107
        self.connections = []
135
108
 
136
 
    def _collect_connection(self, transport, connection, credentials):
 
109
    def set_connection_hook(self, transport, connection, credentials):
137
110
        # Note: uncomment the following line and use 'bt' under pdb, that will
138
111
        # identify all the connections made including the extraneous ones.
139
112
        # import pdb; pdb.set_trace()