← 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: Andrew Bennetts
  • Date: 2010-02-12 04:33:05 UTC
  • mfrom: (5031 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5032.
  • Revision ID: andrew.bennetts@canonical.com-20100212043305-ujdbsdoviql2t7i3
Merge lp:bzr

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, 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.tests import features
18
19
 
19
20
# SFTPTransport offers better performances but relies on paramiko, if paramiko
20
21
# is not available, we fallback to FtpTransport
21
 
from bzrlib.tests import test_sftp_transport
22
 
if test_sftp_transport.paramiko_loaded:
 
22
if features.paramiko.available():
 
23
    from bzrlib.tests import test_sftp_transport
23
24
    from bzrlib.transport import sftp
24
25
    _backing_scheme = 'sftp'
25
26
    _backing_transport_class = sftp.SFTPTransport
99
100
    def setUp(self):
100
101
        register_urlparse_netloc_protocol(_hooked_scheme)
101
102
        register_transport(_hooked_scheme, ConnectionHookedTransport)
102
 
 
103
 
        def unregister():
104
 
            unregister_transport(_hooked_scheme, ConnectionHookedTransport)
105
 
            _unregister_urlparse_netloc_protocol(_hooked_scheme)
106
 
 
107
 
        self.addCleanup(unregister)
 
103
        self.addCleanup(unregister_transport, _hooked_scheme,
 
104
                        ConnectionHookedTransport)
 
105
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
108
106
        super(TestCaseWithConnectionHookedTransport, self).setUp()
109
107
        self.reset_connections()
110
108
        # Add the 'hooked' url to the permitted url list.
127
125
        return url
128
126
 
129
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
130
        ConnectionHookedTransport.hooks.install_named_hook(
131
131
            '_set_connection', self._collect_connection, None)
132
 
        # uninstall our hooks when we are finished
133
 
        self.addCleanup(self.reset_hooks)
134
 
 
135
 
    def reset_hooks(self):
136
 
        InstrumentedTransport.hooks = TransportHooks()
137
132
 
138
133
    def reset_connections(self):
139
134
        self.connections = []