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 |
|
4913.2.22
by John Arbash Meinel
Found something that was using an attribute I removed. |
17 |
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. |
18 |
|
19 |
# SFTPTransport offers better performances but relies on paramiko, if paramiko
|
|
20 |
# is not available, we fallback to FtpTransport
|
|
4913.2.22
by John Arbash Meinel
Found something that was using an attribute I removed. |
21 |
if features.paramiko.available(): |
4913.2.23
by John Arbash Meinel
Of course, you still need to load the module... |
22 |
from bzrlib.tests import test_sftp_transport |
5436.3.4
by Martin
Gut bzrlib.tests.transport_util as it turns out I've just implemented what that was doing anyway |
23 |
from bzrlib.transport import sftp, Transport |
2822.1.3
by v.ladeuil+lp at free
Fix backing transport and server usage for ftp support. |
24 |
_backing_scheme = 'sftp' |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
25 |
_backing_transport_class = sftp.SFTPTransport |
26 |
_backing_test_class = test_sftp_transport.TestCaseWithSFTPServer |
|
27 |
else: |
|
5436.3.4
by Martin
Gut bzrlib.tests.transport_util as it turns out I've just implemented what that was doing anyway |
28 |
from bzrlib.transport import ftp, Transport |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
29 |
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. |
30 |
_backing_scheme = 'ftp' |
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
31 |
_backing_transport_class = ftp.FtpTransport |
32 |
_backing_test_class = test_ftp_transport.TestCaseWithFTPServer |
|
33 |
||
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
34 |
|
2822.1.1
by v.ladeuil+lp at free
Fix #59150 (again) by handling paramiko availability for transport_util.py. |
35 |
class TestCaseWithConnectionHookedTransport(_backing_test_class): |
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
36 |
|
37 |
def setUp(self): |
|
38 |
super(TestCaseWithConnectionHookedTransport, self).setUp() |
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
39 |
self.reset_connections() |
2485.8.61
by Vincent Ladeuil
From review comments, use a private scheme for testing. |
40 |
|
2814.11.1
by Vincent Ladeuil
Renamed install_hooks to start_logging_connections (as per Martin suggestion). |
41 |
def start_logging_connections(self): |
5436.3.4
by Martin
Gut bzrlib.tests.transport_util as it turns out I've just implemented what that was doing anyway |
42 |
Transport.hooks.install_named_hook('post_connect', |
43 |
self.connections.append, None) |
|
2485.8.5
by Vincent Ladeuil
Factor out InstrumentedTransport. |
44 |
|
2485.8.34
by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only |
45 |
def reset_connections(self): |
46 |
self.connections = [] |
|
47 |