/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: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ls.py
20
20
    ignores,
21
21
    tests,
22
22
    )
 
23
from breezy.tests.matchers import ContainsNoVfsCalls
23
24
 
24
25
 
25
26
class TestLS(tests.TestCaseWithTransport):
32
33
 
33
34
        self.wt = self.make_branch_and_tree('.')
34
35
        self.build_tree_contents([
35
 
                                 ('.bzrignore', b'*.pyo\n'),
36
 
                                 ('a', b'hello\n'),
 
36
                                 ('.bzrignore', '*.pyo\n'),
 
37
                                 ('a', 'hello\n'),
37
38
                                 ])
38
39
 
39
40
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
84
85
        self.build_tree(['subdir/'])
85
86
        self.ls_equals('?        .bzrignore\n'
86
87
                       'V        a\n'
87
 
                       '?        subdir/\n', '--verbose')
 
88
                       '?        subdir/\n'
 
89
                       , '--verbose')
88
90
        self.build_tree(['subdir/b'])
89
91
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
90
92
        self.ls_equals('V        .bzrignore\n'
91
93
                       'V        a\n'
92
94
                       'V        subdir/\n'
93
 
                       'V        subdir/b\n', '--verbose')
 
95
                       'V        subdir/b\n'
 
96
                       , '--verbose')
94
97
 
95
98
    def test_show_ids(self):
96
99
        self.build_tree(['subdir/'])
97
 
        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
 
100
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
98
101
        self.ls_equals(
99
102
            '.bzrignore                                         \n'
100
103
            'a                                                  a-id\n'
115
118
 
116
119
        self.ls_equals('.bzrignore\n'
117
120
                       'a\n'
118
 
                       'subdir/\n', recursive=False)
 
121
                       'subdir/\n'
 
122
                       , recursive=False)
119
123
 
120
124
        self.ls_equals('V        .bzrignore\n'
121
125
                       'V        a\n'
122
 
                       'V        subdir/\n', '--verbose', recursive=False)
 
126
                       'V        subdir/\n'
 
127
                       , '--verbose', recursive=False)
123
128
 
124
129
        # Check what happens in a sub-directory
125
130
        self.ls_equals('b\n', working_dir='subdir')
134
139
        """If a path is specified, files are listed with that prefix"""
135
140
        self.build_tree(['subdir/', 'subdir/b'])
136
141
        self.wt.add(['subdir', 'subdir/b'])
137
 
        self.ls_equals('subdir/b\n',
 
142
        self.ls_equals('subdir/b\n' ,
138
143
                       'subdir')
139
144
        self.ls_equals('../.bzrignore\n'
140
145
                       '../a\n'
141
146
                       '../subdir/\n'
142
 
                       '../subdir/b\n',
 
147
                       '../subdir/b\n' ,
143
148
                       '..', working_dir='subdir')
144
149
        self.ls_equals('../.bzrignore\0'
145
150
                       '../a\0'
146
151
                       '../subdir\0'
147
 
                       '../subdir/b\0',
 
152
                       '../subdir/b\0' ,
148
153
                       '.. --null', working_dir='subdir')
149
154
        self.ls_equals('?        ../.bzrignore\n'
150
155
                       '?        ../a\n'
151
156
                       'V        ../subdir/\n'
152
 
                       'V        ../subdir/b\n',
 
157
                       'V        ../subdir/b\n' ,
153
158
                       '.. --verbose', working_dir='subdir')
154
159
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
155
160
                           'ls --from-root ..', working_dir='subdir')
162
167
 
163
168
        # Check what happens when we supply a specific revision
164
169
        self.ls_equals('a\n', '--revision 1')
165
 
        self.ls_equals('V        a\n', '--verbose --revision 1')
 
170
        self.ls_equals('V        a\n'
 
171
                       , '--verbose --revision 1')
166
172
 
167
173
        self.ls_equals('', '--revision 1', working_dir='subdir')
168
174
 
195
201
                       'V        a\n'
196
202
                       '?        blah.py\n'
197
203
                       'I        blah.pyo\n'
198
 
                       'I        user-ignore\n', '--verbose')
 
204
                       'I        user-ignore\n'
 
205
                       , '--verbose')
199
206
        self.ls_equals('blah.pyo\n'
200
 
                       'user-ignore\n', '--ignored')
201
 
        self.ls_equals('blah.py\n', '--unknown')
202
 
        self.ls_equals('.bzrignore\n'
203
 
                       'a\n', '--versioned')
204
 
        self.ls_equals('.bzrignore\n'
205
 
                       'a\n', '-V')
 
207
                       'user-ignore\n'
 
208
                       , '--ignored')
 
209
        self.ls_equals('blah.py\n'
 
210
                       , '--unknown')
 
211
        self.ls_equals('.bzrignore\n'
 
212
                       'a\n'
 
213
                       , '--versioned')
 
214
        self.ls_equals('.bzrignore\n'
 
215
                       'a\n'
 
216
                       , '-V')
206
217
 
207
218
    def test_kinds(self):
208
219
        self.build_tree(['subdir/'])
229
240
        self.wt.commit('commit')
230
241
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
231
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)