/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/commands/test_checkout.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/commands/test_checkout.py
1
 
# Copyright (C) 2007, 2009, 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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
from bzrlib.builtins import cmd_checkout
19
 
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
20
 
 
 
19
from bzrlib.tests.TransportUtil import TestCaseWithConnectionHookedTransport
21
20
 
22
21
class TestCheckout(TestCaseWithConnectionHookedTransport):
23
22
 
24
23
    def test_checkout(self):
25
24
        self.make_branch_and_tree('branch1')
26
25
 
27
 
        self.start_logging_connections()
28
 
 
29
 
        cmd = cmd_checkout()
30
 
        cmd.run(self.get_url('branch1'), 'local')
31
 
        self.assertEquals(1, len(self.connections))
32
 
 
33
 
    def test_checkout_lightweight(self):
34
 
        self.make_branch_and_tree('branch1')
35
 
 
36
 
        self.start_logging_connections()
37
 
 
38
 
        cmd = cmd_checkout()
39
 
        cmd.run(self.get_url('branch1'), 'local', lightweight=True)
 
26
        self.install_hooks()
 
27
        self.addCleanup(self.reset_hooks)
 
28
 
 
29
        cmd = cmd_checkout()
 
30
        cmd.run(self.get_url() + '/branch1', 'local')
40
31
        self.assertEquals(1, len(self.connections))
41
32