/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 breezy/tests/blackbox/test_ls.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

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