/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_ls.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

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-2010 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""External tests of 'brz ls'"""
18
 
 
19
 
from breezy import (
20
 
    ignores,
21
 
    tests,
22
 
    )
23
 
from breezy.tests.matchers import ContainsNoVfsCalls
24
 
 
25
 
 
26
 
class TestLS(tests.TestCaseWithTransport):
 
17
"""External tests of 'bzr ls'"""
 
18
 
 
19
import os
 
20
 
 
21
from bzrlib import ignores, osutils
 
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()
33
32
 
34
33
        self.wt = self.make_branch_and_tree('.')
35
34
        self.build_tree_contents([
36
 
                                 ('.bzrignore', b'*.pyo\n'),
37
 
                                 ('a', b'hello\n'),
 
35
                                 ('.bzrignore', '*.pyo\n'),
 
36
                                 ('a', 'hello\n'),
38
37
                                 ])
39
38
 
40
 
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
 
39
    def ls_equals(self, value, args=None, recursive=True):
41
40
        command = 'ls'
42
41
        if args is not None:
43
42
            command += ' ' + args
44
43
        if recursive:
45
44
            command += ' -R'
46
 
        out, err = self.run_bzr(command, working_dir=working_dir)
 
45
        out, err = self.run_bzr(command)
47
46
        self.assertEqual('', err)
48
47
        self.assertEqualDiff(value, out)
49
48
 
53
52
                           'ls --verbose --null')
54
53
 
55
54
    def test_ls_basic(self):
56
 
        """Test the abilities of 'brz ls'"""
 
55
        """Test the abilities of 'bzr ls'"""
57
56
        self.ls_equals('.bzrignore\na\n')
58
57
        self.ls_equals('.bzrignore\na\n', './')
59
58
        self.ls_equals('?        .bzrignore\n'
85
84
        self.build_tree(['subdir/'])
86
85
        self.ls_equals('?        .bzrignore\n'
87
86
                       'V        a\n'
88
 
                       '?        subdir/\n', '--verbose')
 
87
                       '?        subdir/\n'
 
88
                       , '--verbose')
89
89
        self.build_tree(['subdir/b'])
90
90
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
91
91
        self.ls_equals('V        .bzrignore\n'
92
92
                       'V        a\n'
93
93
                       'V        subdir/\n'
94
 
                       'V        subdir/b\n', '--verbose')
 
94
                       'V        subdir/b\n'
 
95
                       , '--verbose')
95
96
 
96
97
    def test_show_ids(self):
97
98
        self.build_tree(['subdir/'])
98
 
        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
 
99
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
99
100
        self.ls_equals(
100
101
            '.bzrignore                                         \n'
101
102
            'a                                                  a-id\n'
116
117
 
117
118
        self.ls_equals('.bzrignore\n'
118
119
                       'a\n'
119
 
                       'subdir/\n', recursive=False)
 
120
                       'subdir/\n'
 
121
                       , recursive=False)
120
122
 
121
123
        self.ls_equals('V        .bzrignore\n'
122
124
                       'V        a\n'
123
 
                       'V        subdir/\n', '--verbose', recursive=False)
 
125
                       'V        subdir/\n'
 
126
                       , '--verbose', recursive=False)
124
127
 
125
128
        # Check what happens in a sub-directory
126
 
        self.ls_equals('b\n', working_dir='subdir')
127
 
        self.ls_equals('b\0', '--null', working_dir='subdir')
128
 
        self.ls_equals('subdir/b\n', '--from-root', working_dir='subdir')
129
 
        self.ls_equals('subdir/b\0', '--from-root --null',
130
 
                       working_dir='subdir')
131
 
        self.ls_equals('subdir/b\n', '--from-root', recursive=False,
132
 
                       working_dir='subdir')
 
129
        os.chdir('subdir')
 
130
        self.ls_equals('b\n')
 
131
        self.ls_equals('b\0'
 
132
                  , '--null')
 
133
        self.ls_equals('subdir/b\n'
 
134
                       , '--from-root')
 
135
        self.ls_equals('subdir/b\0'
 
136
                       , '--from-root --null')
 
137
        self.ls_equals('subdir/b\n'
 
138
                       , '--from-root', recursive=False)
133
139
 
134
140
    def test_ls_path(self):
135
141
        """If a path is specified, files are listed with that prefix"""
136
142
        self.build_tree(['subdir/', 'subdir/b'])
137
143
        self.wt.add(['subdir', 'subdir/b'])
138
 
        self.ls_equals('subdir/b\n',
 
144
        self.ls_equals('subdir/b\n' ,
139
145
                       'subdir')
 
146
        os.chdir('subdir')
140
147
        self.ls_equals('../.bzrignore\n'
141
148
                       '../a\n'
142
149
                       '../subdir/\n'
143
 
                       '../subdir/b\n',
144
 
                       '..', working_dir='subdir')
 
150
                       '../subdir/b\n' ,
 
151
                       '..')
145
152
        self.ls_equals('../.bzrignore\0'
146
153
                       '../a\0'
147
154
                       '../subdir\0'
148
 
                       '../subdir/b\0',
149
 
                       '.. --null', working_dir='subdir')
 
155
                       '../subdir/b\0' ,
 
156
                       '.. --null')
150
157
        self.ls_equals('?        ../.bzrignore\n'
151
158
                       '?        ../a\n'
152
159
                       'V        ../subdir/\n'
153
 
                       'V        ../subdir/b\n',
154
 
                       '.. --verbose', working_dir='subdir')
 
160
                       'V        ../subdir/b\n' ,
 
161
                       '.. --verbose')
155
162
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
156
 
                           'ls --from-root ..', working_dir='subdir')
 
163
                           'ls --from-root ..')
157
164
 
158
165
    def test_ls_revision(self):
159
166
        self.wt.add(['a'])
163
170
 
164
171
        # Check what happens when we supply a specific revision
165
172
        self.ls_equals('a\n', '--revision 1')
166
 
        self.ls_equals('V        a\n', '--verbose --revision 1')
 
173
        self.ls_equals('V        a\n'
 
174
                       , '--verbose --revision 1')
167
175
 
168
 
        self.ls_equals('', '--revision 1', working_dir='subdir')
 
176
        os.chdir('subdir')
 
177
        self.ls_equals('', '--revision 1')
169
178
 
170
179
    def test_ls_branch(self):
171
180
        """If a branch is specified, files are listed from it"""
196
205
                       'V        a\n'
197
206
                       '?        blah.py\n'
198
207
                       'I        blah.pyo\n'
199
 
                       'I        user-ignore\n', '--verbose')
 
208
                       'I        user-ignore\n'
 
209
                       , '--verbose')
200
210
        self.ls_equals('blah.pyo\n'
201
 
                       'user-ignore\n', '--ignored')
202
 
        self.ls_equals('blah.py\n', '--unknown')
203
 
        self.ls_equals('.bzrignore\n'
204
 
                       'a\n', '--versioned')
205
 
        self.ls_equals('.bzrignore\n'
206
 
                       'a\n', '-V')
 
211
                       'user-ignore\n'
 
212
                       , '--ignored')
 
213
        self.ls_equals('blah.py\n'
 
214
                       , '--unknown')
 
215
        self.ls_equals('.bzrignore\n'
 
216
                       'a\n'
 
217
                       , '--versioned')
 
218
        self.ls_equals('.bzrignore\n'
 
219
                       'a\n'
 
220
                       , '-V')
207
221
 
208
222
    def test_kinds(self):
209
223
        self.build_tree(['subdir/'])
230
244
        self.wt.commit('commit')
231
245
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
232
246
        self.ls_equals('sub/file\n', '-d dir sub')
233
 
 
234
 
 
235
 
class TestSmartServerLs(tests.TestCaseWithTransport):
236
 
 
237
 
    def test_simple_ls(self):
238
 
        self.setup_smart_server_with_call_log()
239
 
        t = self.make_branch_and_tree('branch')
240
 
        self.build_tree_contents([('branch/foo', b'thecontents')])
241
 
        t.add("foo")
242
 
        t.commit("message")
243
 
        self.reset_smart_call_log()
244
 
        out, err = self.run_bzr(['ls', self.get_url('branch')])
245
 
        # This figure represent the amount of work to perform this use case. It
246
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
247
 
        # being too low. If rpc_count increases, more network roundtrips have
248
 
        # become necessary for this use case. Please do not adjust this number
249
 
        # upwards without agreement from bzr's network support maintainers.
250
 
        self.assertLength(6, self.hpss_calls)
251
 
        self.assertLength(1, self.hpss_connections)
252
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)