/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_revert.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_revert.py
1
 
# Copyright (C) 2010 Canonical Ltd
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
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
import os
18
 
from bzrlib import (
19
 
    branch,
20
 
    builtins,
21
 
    errors,
22
 
    lock,
23
 
    )
24
 
from bzrlib.tests import (
25
 
    transport_util,
26
 
    TestCaseInTempDir,
27
 
    )
28
 
 
29
 
 
30
 
class TestRevert(TestCaseInTempDir):
31
 
 
32
 
    def setUp(self):
33
 
        super(TestRevert, self).setUp()
34
 
 
35
 
    def test_revert_tree_write_lock_and_branch_read_lock(self):
36
 
 
37
 
        # install lock hooks to find out about cmd_revert's locking actions
38
 
        locks_acquired = []
39
 
        locks_released = []
40
 
        lock.Lock.hooks.install_named_hook('lock_acquired',
41
 
            locks_acquired.append, None)
42
 
        lock.Lock.hooks.install_named_hook('lock_released',
43
 
            locks_released.append, None)
44
 
 
45
 
        # execute the revert command (There is nothing to actually revert,
46
 
        # but locks are acquired either way.)
47
 
        revert = builtins.cmd_revert()
48
 
        revert.run()
49
 
 
50
 
        # make sure that only one lock is acquired and released.
51
 
        self.assertLength(1, locks_acquired)
52
 
        self.assertLength(1, locks_released)
53
 
 
54
 
        # make sure that the nonces are the same, since otherwise
55
 
        # this would not be the same lock.
56
 
        self.assertEqual(locks_acquired[0].details, locks_released[0].details)
57
 
 
58
 
        # make sure that the locks are checkout locks.
59
 
        self.assertEndsWith(locks_acquired[0].lock_url, "/checkout/lock")
60
 
        self.assertEndsWith(locks_released[0].lock_url, "/checkout/lock")
61