← 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: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

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
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()
37
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
 
127
126
                       , '--verbose', recursive=False)
128
127
 
129
128
        # 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')
 
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)
137
139
 
138
140
    def test_ls_path(self):
139
141
        """If a path is specified, files are listed with that prefix"""
141
143
        self.wt.add(['subdir', 'subdir/b'])
142
144
        self.ls_equals('subdir/b\n' ,
143
145
                       'subdir')
 
146
        os.chdir('subdir')
144
147
        self.ls_equals('../.bzrignore\n'
145
148
                       '../a\n'
146
149
                       '../subdir/\n'
147
150
                       '../subdir/b\n' ,
148
 
                       '..', working_dir='subdir')
 
151
                       '..')
149
152
        self.ls_equals('../.bzrignore\0'
150
153
                       '../a\0'
151
154
                       '../subdir\0'
152
155
                       '../subdir/b\0' ,
153
 
                       '.. --null', working_dir='subdir')
 
156
                       '.. --null')
154
157
        self.ls_equals('?        ../.bzrignore\n'
155
158
                       '?        ../a\n'
156
159
                       'V        ../subdir/\n'
157
160
                       'V        ../subdir/b\n' ,
158
 
                       '.. --verbose', working_dir='subdir')
 
161
                       '.. --verbose')
159
162
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
160
 
                           'ls --from-root ..', working_dir='subdir')
 
163
                           'ls --from-root ..')
161
164
 
162
165
    def test_ls_revision(self):
163
166
        self.wt.add(['a'])
170
173
        self.ls_equals('V        a\n'
171
174
                       , '--verbose --revision 1')
172
175
 
173
 
        self.ls_equals('', '--revision 1', working_dir='subdir')
 
176
        os.chdir('subdir')
 
177
        self.ls_equals('', '--revision 1')
174
178
 
175
179
    def test_ls_branch(self):
176
180
        """If a branch is specified, files are listed from it"""
231
235
                       '%s/a\n'
232
236
                       % (self.test_dir, self.test_dir),
233
237
                       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)