← 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: Robert Collins
  • Date: 2007-05-07 16:48:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2485.
  • Revision ID: robertc@robertcollins.net-20070507164814-wpagonutf4b5cf8s
Move HACKING to docs/developers/HACKING and adjust Makefile to accomodate this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2012 Canonical Ltd
 
1
# Copyright (C) 2006 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
"""External tests of 'bzr ls'"""
18
18
 
19
 
from bzrlib import (
20
 
    ignores,
21
 
    tests,
22
 
    )
23
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
24
 
 
25
 
 
26
 
class TestLS(tests.TestCaseWithTransport):
 
19
import os
 
20
 
 
21
from bzrlib import ignores
 
22
from bzrlib.tests import TestCaseWithTransport
 
23
 
 
24
 
 
25
class TestLS(TestCaseWithTransport):
27
26
 
28
27
    def setUp(self):
29
28
        super(TestLS, self).setUp()
30
 
 
 
29
        
31
30
        # Create a simple branch that can be used in testing
32
31
        ignores._set_user_ignores(['user-ignore'])
33
32
 
37
36
                                 ('a', 'hello\n'),
38
37
                                 ])
39
38
 
40
 
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
41
 
        command = 'ls'
42
 
        if args is not None:
43
 
            command += ' ' + args
44
 
        if recursive:
45
 
            command += ' -R'
46
 
        out, err = self.run_bzr(command, working_dir=working_dir)
 
39
    def ls_equals(self, value, *args):
 
40
        out, err = self.run_bzr('ls', *args)
47
41
        self.assertEqual('', err)
48
42
        self.assertEqualDiff(value, out)
49
43
 
50
44
    def test_ls_null_verbose(self):
51
45
        # Can't supply both
52
46
        self.run_bzr_error(['Cannot set both --verbose and --null'],
53
 
                           'ls --verbose --null')
 
47
                           'ls', '--verbose', '--null')
54
48
 
55
49
    def test_ls_basic(self):
56
50
        """Test the abilities of 'bzr ls'"""
57
51
        self.ls_equals('.bzrignore\na\n')
58
 
        self.ls_equals('.bzrignore\na\n', './')
59
52
        self.ls_equals('?        .bzrignore\n'
60
53
                       '?        a\n',
61
54
                       '--verbose')
64
57
                       '--unknown')
65
58
        self.ls_equals('', '--ignored')
66
59
        self.ls_equals('', '--versioned')
67
 
        self.ls_equals('', '-V')
68
 
        self.ls_equals('.bzrignore\n'
69
 
                       'a\n',
70
 
                       '--unknown --ignored --versioned')
71
 
        self.ls_equals('.bzrignore\n'
72
 
                       'a\n',
73
 
                       '--unknown --ignored -V')
74
 
        self.ls_equals('', '--ignored --versioned')
75
 
        self.ls_equals('', '--ignored -V')
 
60
        self.ls_equals('.bzrignore\n'
 
61
                       'a\n',
 
62
                       '--unknown', '--ignored', '--versioned')
 
63
        self.ls_equals('', '--ignored', '--versioned')
76
64
        self.ls_equals('.bzrignore\0a\0', '--null')
77
65
 
78
66
    def test_ls_added(self):
81
69
                       'V        a\n',
82
70
                       '--verbose')
83
71
        self.wt.commit('add')
84
 
 
 
72
        
85
73
        self.build_tree(['subdir/'])
86
74
        self.ls_equals('?        .bzrignore\n'
87
75
                       'V        a\n'
101
89
        self.ls_equals(
102
90
            '.bzrignore                                         \n'
103
91
            'a                                                  a-id\n'
104
 
            'subdir/                                            subdir-id\n',
 
92
            'subdir                                             subdir-id\n', 
105
93
            '--show-ids')
106
94
        self.ls_equals(
107
95
            '?        .bzrignore\n'
108
96
            'V        a                                         a-id\n'
109
 
            'V        subdir/                                   subdir-id\n',
110
 
            '--show-ids --verbose')
 
97
            'V        subdir/                                   subdir-id\n', 
 
98
            '--show-ids', '--verbose')
111
99
        self.ls_equals('.bzrignore\0\0'
112
100
                       'a\0a-id\0'
113
 
                       'subdir\0subdir-id\0', '--show-ids --null')
 
101
                       'subdir\0subdir-id\0', '--show-ids', '--null')
114
102
 
115
 
    def test_ls_no_recursive(self):
 
103
    def test_ls_recursive(self):
116
104
        self.build_tree(['subdir/', 'subdir/b'])
117
105
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
118
106
 
119
107
        self.ls_equals('.bzrignore\n'
120
108
                       'a\n'
121
 
                       'subdir/\n'
122
 
                       , recursive=False)
 
109
                       'subdir\n'
 
110
                       , '--non-recursive')
123
111
 
124
112
        self.ls_equals('V        .bzrignore\n'
125
113
                       'V        a\n'
126
114
                       'V        subdir/\n'
127
 
                       , '--verbose', recursive=False)
 
115
                       , '--verbose', '--non-recursive')
128
116
 
129
117
        # Check what happens in a sub-directory
130
 
        self.ls_equals('b\n', working_dir='subdir')
131
 
        self.ls_equals('b\0', '--null', working_dir='subdir')
132
 
        self.ls_equals('subdir/b\n', '--from-root', working_dir='subdir')
133
 
        self.ls_equals('subdir/b\0', '--from-root --null',
134
 
                       working_dir='subdir')
135
 
        self.ls_equals('subdir/b\n', '--from-root', recursive=False,
136
 
                       working_dir='subdir')
 
118
        os.chdir('subdir')
 
119
        self.ls_equals('b\n')
 
120
        self.ls_equals('b\0'
 
121
                  , '--null')
 
122
        self.ls_equals('.bzrignore\n'
 
123
                       'a\n'
 
124
                       'subdir\n'
 
125
                       'subdir/b\n'
 
126
                       , '--from-root')
 
127
        self.ls_equals('.bzrignore\0'
 
128
                       'a\0'
 
129
                       'subdir\0'
 
130
                       'subdir/b\0'
 
131
                       , '--from-root', '--null')
 
132
        self.ls_equals('.bzrignore\n'
 
133
                       'a\n'
 
134
                       'subdir\n'
 
135
                       , '--from-root', '--non-recursive')
137
136
 
138
137
    def test_ls_path(self):
139
138
        """If a path is specified, files are listed with that prefix"""
141
140
        self.wt.add(['subdir', 'subdir/b'])
142
141
        self.ls_equals('subdir/b\n' ,
143
142
                       'subdir')
 
143
        os.chdir('subdir')
144
144
        self.ls_equals('../.bzrignore\n'
145
145
                       '../a\n'
146
 
                       '../subdir/\n'
 
146
                       '../subdir\n'
147
147
                       '../subdir/b\n' ,
148
 
                       '..', working_dir='subdir')
 
148
                       '..')
149
149
        self.ls_equals('../.bzrignore\0'
150
150
                       '../a\0'
151
151
                       '../subdir\0'
152
152
                       '../subdir/b\0' ,
153
 
                       '.. --null', working_dir='subdir')
 
153
                       '..', '--null')
154
154
        self.ls_equals('?        ../.bzrignore\n'
155
155
                       '?        ../a\n'
156
156
                       'V        ../subdir/\n'
157
157
                       'V        ../subdir/b\n' ,
158
 
                       '.. --verbose', working_dir='subdir')
159
 
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
160
 
                           'ls --from-root ..', working_dir='subdir')
 
158
                       '..', '--verbose')
 
159
        self.run_bzr_error('cannot specify both --from-root and PATH', 'ls',
 
160
                           '--from-root', '..')
161
161
 
162
162
    def test_ls_revision(self):
163
163
        self.wt.add(['a'])
166
166
        self.build_tree(['subdir/'])
167
167
 
168
168
        # Check what happens when we supply a specific revision
169
 
        self.ls_equals('a\n', '--revision 1')
 
169
        self.ls_equals('a\n', '--revision', '1')
170
170
        self.ls_equals('V        a\n'
171
 
                       , '--verbose --revision 1')
 
171
                       , '--verbose', '--revision', '1')
172
172
 
173
 
        self.ls_equals('', '--revision 1', working_dir='subdir')
 
173
        os.chdir('subdir')
 
174
        self.ls_equals('', '--revision', '1')
174
175
 
175
176
    def test_ls_branch(self):
176
177
        """If a branch is specified, files are listed from it"""
179
180
        self.wt.commit('committing')
180
181
        branch = self.make_branch('branchdir')
181
182
        branch.pull(self.wt.branch)
182
 
        self.ls_equals('branchdir/subdir/\n'
 
183
        self.ls_equals('branchdir/subdir\n'
183
184
                       'branchdir/subdir/b\n',
184
185
                       'branchdir')
185
 
        self.ls_equals('branchdir/subdir/\n'
 
186
        self.ls_equals('branchdir/subdir\n'
186
187
                       'branchdir/subdir/b\n',
187
 
                       'branchdir --revision 1')
 
188
                       'branchdir', '--revision', '1')
188
189
 
189
190
    def test_ls_ignored(self):
190
191
        # Now try to do ignored files.
211
212
        self.ls_equals('.bzrignore\n'
212
213
                       'a\n'
213
214
                       , '--versioned')
214
 
        self.ls_equals('.bzrignore\n'
215
 
                       'a\n'
216
 
                       , '-V')
217
215
 
218
216
    def test_kinds(self):
219
217
        self.build_tree(['subdir/'])
220
 
        self.ls_equals('.bzrignore\n'
221
 
                       'a\n',
 
218
        self.ls_equals('.bzrignore\n' 
 
219
                       'a\n', 
222
220
                       '--kind=file')
223
 
        self.ls_equals('subdir/\n',
 
221
        self.ls_equals('subdir\n',
224
222
                       '--kind=directory')
225
223
        self.ls_equals('',
226
224
                       '--kind=symlink')
227
 
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
228
 
 
229
 
    def test_ls_path_nonrecursive(self):
230
 
        self.ls_equals('%s/.bzrignore\n'
231
 
                       '%s/a\n'
232
 
                       % (self.test_dir, self.test_dir),
233
 
                       self.test_dir, recursive=False)
234
 
 
235
 
    def test_ls_directory(self):
236
 
        """Test --directory option"""
237
 
        self.wt = self.make_branch_and_tree('dir')
238
 
        self.build_tree(['dir/sub/', 'dir/sub/file'])
239
 
        self.wt.add(['sub', 'sub/file'])
240
 
        self.wt.commit('commit')
241
 
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
242
 
        self.ls_equals('sub/file\n', '-d dir sub')
243
 
 
244
 
 
245
 
class TestSmartServerLs(tests.TestCaseWithTransport):
246
 
 
247
 
    def test_simple_ls(self):
248
 
        self.setup_smart_server_with_call_log()
249
 
        t = self.make_branch_and_tree('branch')
250
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
251
 
        t.add("foo")
252
 
        t.commit("message")
253
 
        self.reset_smart_call_log()
254
 
        out, err = self.run_bzr(['ls', self.get_url('branch')])
255
 
        # This figure represent the amount of work to perform this use case. It
256
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
257
 
        # being too low. If rpc_count increases, more network roundtrips have
258
 
        # become necessary for this use case. Please do not adjust this number
259
 
        # upwards without agreement from bzr's network support maintainers.
260
 
        self.assertLength(6, self.hpss_calls)
261
 
        self.assertLength(1, self.hpss_connections)
262
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
225
        self.run_bzr_error('invalid kind specified', 'ls', '--kind=pile')