/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/TransportUtil.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/TransportUtil.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
16
 
 
17
 
import bzrlib.hooks
18
 
from bzrlib.tests import features
19
 
 
20
 
# SFTPTransport offers better performances but relies on paramiko, if paramiko
21
 
# is not available, we fallback to FtpTransport
22
 
if features.paramiko.available():
23
 
    from bzrlib.tests import test_sftp_transport
24
 
    from bzrlib.transport import sftp
25
 
    _backing_scheme = 'sftp'
26
 
    _backing_transport_class = sftp.SFTPTransport
27
 
    _backing_test_class = test_sftp_transport.TestCaseWithSFTPServer
28
 
else:
29
 
    from bzrlib.transport import ftp
30
 
    from bzrlib.tests import test_ftp_transport
31
 
    _backing_scheme = 'ftp'
32
 
    _backing_transport_class = ftp.FtpTransport
33
 
    _backing_test_class = test_ftp_transport.TestCaseWithFTPServer
34
 
 
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from bzrlib.hooks import Hooks
 
19
from bzrlib.tests.test_ftp_transport import TestCaseWithFTPServer
35
20
from bzrlib.transport import (
36
 
    ConnectedTransport,
37
 
    get_transport,
38
21
    register_transport,
39
 
    register_urlparse_netloc_protocol,
40
22
    unregister_transport,
41
 
    _unregister_urlparse_netloc_protocol,
42
23
    )
43
 
 
44
 
 
45
 
 
46
 
class TransportHooks(bzrlib.hooks.Hooks):
 
24
from bzrlib.transport.ftp import FtpTransport
 
25
 
 
26
 
 
27
class TransportHooks(Hooks):
47
28
    """Dict-mapping hook name to a list of callables for transport hooks"""
48
29
 
49
30
    def __init__(self):
50
 
        super(TransportHooks, self).__init__()
 
31
        Hooks.__init__(self)
51
32
        # Invoked when the transport has just created a new connection.
52
33
        # The api signature is (transport, connection, credentials)
53
34
        self['_set_connection'] = []
54
35
 
55
 
_hooked_scheme = 'hooked'
56
 
 
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
 
class InstrumentedTransport(_backing_transport_class):
 
36
 
 
37
class InstrumentedTransport(FtpTransport):
65
38
    """Instrumented transport class to test commands behavior"""
66
39
 
67
40
    hooks = TransportHooks()
68
41
 
69
 
    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)
85
 
 
86
42
 
87
43
class ConnectionHookedTransport(InstrumentedTransport):
88
44
    """Transport instrumented to inspect connections"""
95
51
            hook(self, connection, credentials)
96
52
 
97
53
 
98
 
class TestCaseWithConnectionHookedTransport(_backing_test_class):
 
54
class TestCaseWithConnectionHookedTransport(TestCaseWithFTPServer):
99
55
 
100
56
    def setUp(self):
101
 
        register_urlparse_netloc_protocol(_hooked_scheme)
102
 
        register_transport(_hooked_scheme, ConnectionHookedTransport)
103
 
        self.addCleanup(unregister_transport, _hooked_scheme,
104
 
                        ConnectionHookedTransport)
105
 
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
106
57
        super(TestCaseWithConnectionHookedTransport, self).setUp()
107
 
        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
 
 
119
 
    def get_url(self, relpath=None):
120
 
        super_self = super(TestCaseWithConnectionHookedTransport, self)
121
 
        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)
125
 
        return url
126
 
 
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)
 
58
        self._hooks_installed = False
 
59
 
 
60
        def cleanup():
 
61
            # Be nice and reset hooks if the test writer forgot about them
 
62
            if self._hooks_installed:
 
63
                self.reset_hooks()
 
64
 
 
65
        self.addCleanup(cleanup)
 
66
        self.connections = []
 
67
 
 
68
    def install_hooks(self):
 
69
        ConnectionHookedTransport.hooks.install_hook('_set_connection',
 
70
                                                     self.set_connection_hook)
 
71
        # Make our instrumented transport the default ftp transport
 
72
        register_transport('ftp://', ConnectionHookedTransport)
 
73
        self._hooks_installed = True
 
74
 
 
75
    def reset_hooks(self):
 
76
        InstrumentedTransport.hooks = TransportHooks()
 
77
        unregister_transport('ftp://', ConnectionHookedTransport)
 
78
        self._hooks_installed = False
132
79
 
133
80
    def reset_connections(self):
134
81
        self.connections = []
135
82
 
136
 
    def _collect_connection(self, transport, connection, credentials):
137
 
        # Note: uncomment the following line and use 'bt' under pdb, that will
138
 
        # identify all the connections made including the extraneous ones.
 
83
    def set_connection_hook(self, transport, connection, credentials):
 
84
        # Note: uncomment the following line and use 'bt' under pdb, here is
 
85
        # the extra connection.
139
86
        # import pdb; pdb.set_trace()
140
87
        self.connections.append(connection)
141
88