← 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: 2010-04-08 06:17:41 UTC
  • mfrom: (4797.33.16 apport)
  • Revision ID: pqm@pqm.ubuntu.com-20100408061741-m7vl6z97vu33riv7
(robertc) Make sure ExecutablePath and InterpreterPath are set in
        Apport. (Martin Pool, James Westby, lp:528114)

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.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
33
34
 
34
35
from bzrlib.transport import (
35
36
    ConnectedTransport,
 
37
    get_transport,
36
38
    register_transport,
37
39
    register_urlparse_netloc_protocol,
38
40
    unregister_transport,
98
100
    def setUp(self):
99
101
        register_urlparse_netloc_protocol(_hooked_scheme)
100
102
        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)
 
103
        self.addCleanup(unregister_transport, _hooked_scheme,
 
104
                        ConnectionHookedTransport)
 
105
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
107
106
        super(TestCaseWithConnectionHookedTransport, self).setUp()
108
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)
109
118
 
110
119
    def get_url(self, relpath=None):
111
120
        super_self = super(TestCaseWithConnectionHookedTransport, self)
116
125
        return url
117
126
 
118
127
    def start_logging_connections(self):
 
128
        self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks())
 
129
        # We preserved the hooks class attribute. Now we install our hook.
119
130
        ConnectionHookedTransport.hooks.install_named_hook(
120
131
            '_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
132
 
127
133
    def reset_connections(self):
128
134
        self.connections = []