4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2007-2010 Canonical Ltd
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
16 |
|
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
17 |
import bzrlib.hooks |
5609.9.1
by Martin
Blindly change all users of get_transport to address the function via the transport module |
18 |
from bzrlib import transport |
4913.2.22
by John Arbash Meinel
Found something that was using an attribute I removed. |
19 |
from bzrlib.tests import features |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
20 |
|
21 |
# SFTPTransport offers better performances but relies on paramiko, if paramiko
|
|
22 |
# is not available, we fallback to FtpTransport
|
|
4913.2.22
by John Arbash Meinel
Found something that was using an attribute I removed. |
23 |
if features.paramiko.available(): |
4913.2.23
by John Arbash Meinel
Of course, you still need to load the module... |
24 |
from bzrlib.tests import test_sftp_transport |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
25 |
from bzrlib.transport import sftp |
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
26 |
_backing_scheme = 'sftp' |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
27 |
_backing_transport_class = sftp.SFTPTransport |
28 |
_backing_test_class = test_sftp_transport.TestCaseWithSFTPServer |
|
29 |
else: |
|
30 |
from bzrlib.transport import ftp |
|
31 |
from bzrlib.tests import test_ftp_transport |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
32 |
_backing_scheme = 'ftp' |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
33 |
_backing_transport_class = ftp.FtpTransport |
34 |
_backing_test_class = test_ftp_transport.TestCaseWithFTPServer |
|
35 |
||
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
36 |
from bzrlib.transport import ( |
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
37 |
ConnectedTransport, |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
38 |
register_transport, |
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
39 |
register_urlparse_netloc_protocol, |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
40 |
unregister_transport, |
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
41 |
_unregister_urlparse_netloc_protocol, |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
42 |
)
|
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
43 |
|
44 |
||
45 |
||
46 |
class TransportHooks(bzrlib.hooks.Hooks): |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
47 |
"""Dict-mapping hook name to a list of callables for transport hooks"""
|
48 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
49 |
def __init__(self): |
50 |
super(TransportHooks, self).__init__("bzrlib.tests.transport_util", |
|
51 |
"InstrumentedTransport.hooks") |
|
2485.8.34
by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only |
52 |
# Invoked when the transport has just created a new connection.
|
53 |
# The api signature is (transport, connection, credentials)
|
|
54 |
self['_set_connection'] = [] |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
55 |
|
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
56 |
_hooked_scheme = 'hooked' |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
57 |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
58 |
def _change_scheme_in(url, actual, desired): |
2822.1.4
by Vincent Ladeuil
Review feedback. |
59 |
if not url.startswith(actual + '://'): |
2822.1.5
by Vincent Ladeuil
Review feeback. |
60 |
raise AssertionError('url "%r" does not start with "%r]"' |
61 |
% (url, actual)) |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
62 |
return desired + url[len(actual):] |
63 |
||
64 |
||
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
65 |
class InstrumentedTransport(_backing_transport_class): |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
66 |
"""Instrumented transport class to test commands behavior"""
|
67 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
68 |
hooks = TransportHooks() |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
69 |
|
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
70 |
def __init__(self, base, _from_transport=None): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
71 |
if not base.startswith(_hooked_scheme + '://'): |
72 |
raise ValueError(base) |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
73 |
# We need to trick the backing transport class about the scheme used
|
2822.1.4
by Vincent Ladeuil
Review feedback. |
74 |
# We'll do the reverse when we need to talk to the backing server
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
75 |
fake_base = _change_scheme_in(base, _hooked_scheme, _backing_scheme) |
76 |
super(InstrumentedTransport, self).__init__( |
|
77 |
fake_base, _from_transport=_from_transport) |
|
78 |
# The following is needed to minimize the effects of our trick above
|
|
79 |
# while retaining the best compatibility.
|
|
6055.2.1
by Jelmer Vernooij
Add UnparsedUrl. |
80 |
self._parsed_url.scheme = _hooked_scheme |
81 |
base = self._unsplit_url(self._parsed_url.scheme, |
|
82 |
self._parsed_url.user, |
|
83 |
self._parsed_url.password, |
|
84 |
self._parsed_url.host, self._parsed_url.port, |
|
85 |
self._parsed_url.path) |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
86 |
super(ConnectedTransport, self).__init__(base) |
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
87 |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
88 |
|
89 |
class ConnectionHookedTransport(InstrumentedTransport): |
|
90 |
"""Transport instrumented to inspect connections"""
|
|
91 |
||
2485.8.34
by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only |
92 |
def _set_connection(self, connection, credentials): |
93 |
"""Called when a new connection is created """
|
|
94 |
super(ConnectionHookedTransport, self)._set_connection(connection, |
|
95 |
credentials) |
|
96 |
for hook in self.hooks['_set_connection']: |
|
97 |
hook(self, connection, credentials) |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
98 |
|
99 |
||
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
100 |
class TestCaseWithConnectionHookedTransport(_backing_test_class): |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
101 |
|
102 |
def setUp(self): |
|
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
103 |
register_urlparse_netloc_protocol(_hooked_scheme) |
104 |
register_transport(_hooked_scheme, ConnectionHookedTransport) |
|
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
105 |
self.addCleanup(unregister_transport, _hooked_scheme, |
106 |
ConnectionHookedTransport) |
|
107 |
self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme) |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
108 |
super(TestCaseWithConnectionHookedTransport, self).setUp() |
2485.8.59
by Vincent Ladeuil
Update from review comments. |
109 |
self.reset_connections() |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
110 |
# Add the 'hooked' url to the permitted url list.
|
111 |
# XXX: See TestCase.start_server. This whole module shouldn't need to
|
|
112 |
# exist - a bug has been filed on that. once its cleanedup/removed, the
|
|
113 |
# standard test support code will work and permit the server url
|
|
114 |
# correctly.
|
|
115 |
url = self.get_url() |
|
5609.9.1
by Martin
Blindly change all users of get_transport to address the function via the transport module |
116 |
t = transport.get_transport(url) |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
117 |
if t.base.endswith('work/'): |
118 |
t = t.clone('../..') |
|
119 |
self.permit_url(t.base) |
|
2485.8.36
by Vincent Ladeuil
Fix test suite to provide a better debugging experience. |
120 |
|
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
121 |
def get_url(self, relpath=None): |
122 |
super_self = super(TestCaseWithConnectionHookedTransport, self) |
|
123 |
url = super_self.get_url(relpath) |
|
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
124 |
# Replace the backing scheme by our own (see
|
125 |
# InstrumentedTransport.__init__)
|
|
126 |
url = _change_scheme_in(url, _backing_scheme, _hooked_scheme) |
|
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
127 |
return url |
128 |
||
2814.11.1
by Vincent Ladeuil
Renamed install_hooks to start_logging_connections (as per Martin suggestion). |
129 |
def start_logging_connections(self): |
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
130 |
self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks()) |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
131 |
# We preserved the hooks class attribute. Now we install our hook.
|
3256.2.13
by Daniel Watkins
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.transport_util. |
132 |
ConnectionHookedTransport.hooks.install_named_hook( |
133 |
'_set_connection', self._collect_connection, None) |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
134 |
|
2485.8.34
by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only |
135 |
def reset_connections(self): |
136 |
self.connections = [] |
|
137 |
||
2814.11.1
by Vincent Ladeuil
Renamed install_hooks to start_logging_connections (as per Martin suggestion). |
138 |
def _collect_connection(self, transport, connection, credentials): |
2485.8.56
by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections. |
139 |
# Note: uncomment the following line and use 'bt' under pdb, that will
|
140 |
# identify all the connections made including the extraneous ones.
|
|
2485.8.37
by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp |
141 |
# import pdb; pdb.set_trace()
|
2485.8.34
by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only |
142 |
self.connections.append(connection) |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
143 |