← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ls.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_ls.py
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
"""External tests of 'bzr ls'"""
18
18
 
26
26
 
27
27
    def setUp(self):
28
28
        super(TestLS, self).setUp()
29
 
 
 
29
        
30
30
        # Create a simple branch that can be used in testing
31
31
        ignores._set_user_ignores(['user-ignore'])
32
32
 
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None):
40
 
        command = 'ls'
41
 
        if args is not None:
42
 
            command += ' ' + args
43
 
        out, err = self.run_bzr(command)
 
39
    def ls_equals(self, value, *args):
 
40
        out, err = self.run_bzr('ls', *args)
44
41
        self.assertEqual('', err)
45
42
        self.assertEqualDiff(value, out)
46
43
 
47
44
    def test_ls_null_verbose(self):
48
45
        # Can't supply both
49
46
        self.run_bzr_error(['Cannot set both --verbose and --null'],
50
 
                           'ls --verbose --null')
 
47
                           'ls', '--verbose', '--null')
51
48
 
52
49
    def test_ls_basic(self):
53
50
        """Test the abilities of 'bzr ls'"""
60
57
                       '--unknown')
61
58
        self.ls_equals('', '--ignored')
62
59
        self.ls_equals('', '--versioned')
63
 
        self.ls_equals('', '-V')
64
 
        self.ls_equals('.bzrignore\n'
65
 
                       'a\n',
66
 
                       '--unknown --ignored --versioned')
67
 
        self.ls_equals('.bzrignore\n'
68
 
                       'a\n',
69
 
                       '--unknown --ignored -V')
70
 
        self.ls_equals('', '--ignored --versioned')
71
 
        self.ls_equals('', '--ignored -V')
 
60
        self.ls_equals('.bzrignore\n'
 
61
                       'a\n',
 
62
                       '--unknown', '--ignored', '--versioned')
 
63
        self.ls_equals('', '--ignored', '--versioned')
72
64
        self.ls_equals('.bzrignore\0a\0', '--null')
73
65
 
74
66
    def test_ls_added(self):
77
69
                       'V        a\n',
78
70
                       '--verbose')
79
71
        self.wt.commit('add')
80
 
 
 
72
        
81
73
        self.build_tree(['subdir/'])
82
74
        self.ls_equals('?        .bzrignore\n'
83
75
                       'V        a\n'
97
89
        self.ls_equals(
98
90
            '.bzrignore                                         \n'
99
91
            'a                                                  a-id\n'
100
 
            'subdir/                                            subdir-id\n',
 
92
            'subdir                                             subdir-id\n', 
101
93
            '--show-ids')
102
94
        self.ls_equals(
103
95
            '?        .bzrignore\n'
104
96
            'V        a                                         a-id\n'
105
 
            'V        subdir/                                   subdir-id\n',
106
 
            '--show-ids --verbose')
 
97
            'V        subdir/                                   subdir-id\n', 
 
98
            '--show-ids', '--verbose')
107
99
        self.ls_equals('.bzrignore\0\0'
108
100
                       'a\0a-id\0'
109
 
                       'subdir\0subdir-id\0', '--show-ids --null')
 
101
                       'subdir\0subdir-id\0', '--show-ids', '--null')
110
102
 
111
103
    def test_ls_recursive(self):
112
104
        self.build_tree(['subdir/', 'subdir/b'])
114
106
 
115
107
        self.ls_equals('.bzrignore\n'
116
108
                       'a\n'
117
 
                       'subdir/\n'
 
109
                       'subdir\n'
118
110
                       , '--non-recursive')
119
111
 
120
112
        self.ls_equals('V        .bzrignore\n'
121
113
                       'V        a\n'
122
114
                       'V        subdir/\n'
123
 
                       , '--verbose --non-recursive')
 
115
                       , '--verbose', '--non-recursive')
124
116
 
125
117
        # Check what happens in a sub-directory
126
118
        os.chdir('subdir')
129
121
                  , '--null')
130
122
        self.ls_equals('.bzrignore\n'
131
123
                       'a\n'
132
 
                       'subdir/\n'
 
124
                       'subdir\n'
133
125
                       'subdir/b\n'
134
126
                       , '--from-root')
135
127
        self.ls_equals('.bzrignore\0'
136
128
                       'a\0'
137
129
                       'subdir\0'
138
130
                       'subdir/b\0'
139
 
                       , '--from-root --null')
 
131
                       , '--from-root', '--null')
140
132
        self.ls_equals('.bzrignore\n'
141
133
                       'a\n'
142
 
                       'subdir/\n'
143
 
                       , '--from-root --non-recursive')
 
134
                       'subdir\n'
 
135
                       , '--from-root', '--non-recursive')
144
136
 
145
137
    def test_ls_path(self):
146
138
        """If a path is specified, files are listed with that prefix"""
151
143
        os.chdir('subdir')
152
144
        self.ls_equals('../.bzrignore\n'
153
145
                       '../a\n'
154
 
                       '../subdir/\n'
 
146
                       '../subdir\n'
155
147
                       '../subdir/b\n' ,
156
148
                       '..')
157
149
        self.ls_equals('../.bzrignore\0'
158
150
                       '../a\0'
159
151
                       '../subdir\0'
160
152
                       '../subdir/b\0' ,
161
 
                       '.. --null')
 
153
                       '..', '--null')
162
154
        self.ls_equals('?        ../.bzrignore\n'
163
155
                       '?        ../a\n'
164
156
                       'V        ../subdir/\n'
165
157
                       'V        ../subdir/b\n' ,
166
 
                       '.. --verbose')
167
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
168
 
                           'ls --from-root ..')
 
158
                       '..', '--verbose')
 
159
        self.run_bzr_error('cannot specify both --from-root and PATH', 'ls',
 
160
                           '--from-root', '..')
169
161
 
170
162
    def test_ls_revision(self):
171
163
        self.wt.add(['a'])
174
166
        self.build_tree(['subdir/'])
175
167
 
176
168
        # Check what happens when we supply a specific revision
177
 
        self.ls_equals('a\n', '--revision 1')
 
169
        self.ls_equals('a\n', '--revision', '1')
178
170
        self.ls_equals('V        a\n'
179
 
                       , '--verbose --revision 1')
 
171
                       , '--verbose', '--revision', '1')
180
172
 
181
173
        os.chdir('subdir')
182
 
        self.ls_equals('', '--revision 1')
 
174
        self.ls_equals('', '--revision', '1')
183
175
 
184
176
    def test_ls_branch(self):
185
177
        """If a branch is specified, files are listed from it"""
188
180
        self.wt.commit('committing')
189
181
        branch = self.make_branch('branchdir')
190
182
        branch.pull(self.wt.branch)
191
 
        self.ls_equals('branchdir/subdir/\n'
 
183
        self.ls_equals('branchdir/subdir\n'
192
184
                       'branchdir/subdir/b\n',
193
185
                       'branchdir')
194
 
        self.ls_equals('branchdir/subdir/\n'
 
186
        self.ls_equals('branchdir/subdir\n'
195
187
                       'branchdir/subdir/b\n',
196
 
                       'branchdir --revision 1')
 
188
                       'branchdir', '--revision', '1')
197
189
 
198
190
    def test_ls_ignored(self):
199
191
        # Now try to do ignored files.
220
212
        self.ls_equals('.bzrignore\n'
221
213
                       'a\n'
222
214
                       , '--versioned')
223
 
        self.ls_equals('.bzrignore\n'
224
 
                       'a\n'
225
 
                       , '-V')
226
215
 
227
216
    def test_kinds(self):
228
217
        self.build_tree(['subdir/'])
229
 
        self.ls_equals('.bzrignore\n'
230
 
                       'a\n',
 
218
        self.ls_equals('.bzrignore\n' 
 
219
                       'a\n', 
231
220
                       '--kind=file')
232
 
        self.ls_equals('subdir/\n',
 
221
        self.ls_equals('subdir\n',
233
222
                       '--kind=directory')
234
223
        self.ls_equals('',
235
224
                       '--kind=symlink')
236
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
225
        self.run_bzr_error('invalid kind specified', 'ls', '--kind=pile')