/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/blackbox/test_modified.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/blackbox/test_modified.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
# -*- coding: utf-8 -*-
3
 
#
4
 
# This program is free software; you can redistribute it and/or modify
5
 
# it under the terms of the GNU General Public License as published by
6
 
# the Free Software Foundation; either version 2 of the License, or
7
 
# (at your option) any later version.
8
 
#
9
 
# This program is distributed in the hope that it will be useful,
10
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
 
# GNU General Public License for more details.
13
 
#
14
 
# You should have received a copy of the GNU General Public License
15
 
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
 
 
18
 
 
19
 
"""Black-box tests for 'bzr modified', which shows modified files."""
20
 
 
21
 
import os
22
 
 
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
class TestModified(ExternalBase):
27
 
 
28
 
    def test_modified(self):
29
 
        """Test that 'modified' command reports modified files"""
30
 
        self._test_modified('a', 'a')
31
 
 
32
 
    def test_modified_with_spaces(self):
33
 
        """Test that 'modified' command reports modified files with spaces in their names quoted"""
34
 
        self._test_modified('a filename with spaces', '"a filename with spaces"')
35
 
 
36
 
    def _test_modified(self, name, output):
37
 
 
38
 
        def check_modified(expected, null=False):
39
 
            command = 'modified'
40
 
            if null:
41
 
                command += ' --null'
42
 
            out, err = self.run_bzr(command)
43
 
            self.assertEquals(out, expected)
44
 
            self.assertEquals(err, '')
45
 
 
46
 
        # in empty directory, nothing modified
47
 
        tree = self.make_branch_and_tree('.')
48
 
        check_modified('')
49
 
 
50
 
        # with unknown file, still nothing modified
51
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
52
 
        check_modified('')
53
 
 
54
 
        # after add, not modified
55
 
        tree.add(name)
56
 
        check_modified('')
57
 
 
58
 
        # after commit, not modified
59
 
        tree.commit(message='add %s' % output)
60
 
        check_modified('')
61
 
 
62
 
        # modify the file
63
 
        self.build_tree_contents([(name, 'changed\n')])
64
 
        check_modified(output + '\n')
65
 
 
66
 
        # check null seps - use the unquoted raw name here
67
 
        check_modified(name + '\0', null=True)
68
 
 
69
 
        # now commit the file and it's no longer modified
70
 
        tree.commit(message='modified %s' %(name))
71
 
        check_modified('')
72