← 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: John Arbash Meinel
  • Date: 2006-09-13 02:44:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060913024423-2f0729076ddd4e31
lazy_import osutils and sign_my_commits
Move doc tests into test_osutils, since lazy_import doesn't play nicely
with DocTest

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 by 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
 
26
26
 
27
27
    def setUp(self):
28
28
        super(TestLS, self).setUp()
29
 
 
 
29
        
30
30
        # Create a simple branch that can be used in testing
31
31
        ignores._set_user_ignores(['user-ignore'])
32
32
 
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None, recursive=True):
40
 
        command = 'ls'
41
 
        if args is not None:
42
 
            command += ' ' + args
43
 
        if recursive:
44
 
            command += ' -R'
45
 
        out, err = self.run_bzr(command)
 
39
    def ls_equals(self, value, *args):
 
40
        out, err = self.run_bzr('ls', *args)
46
41
        self.assertEqual('', err)
47
 
        self.assertEqualDiff(value, out)
 
42
        self.assertEqual(value, out)
48
43
 
49
44
    def test_ls_null_verbose(self):
50
45
        # Can't supply both
51
46
        self.run_bzr_error(['Cannot set both --verbose and --null'],
52
 
                           'ls --verbose --null')
 
47
                           'ls', '--verbose', '--null')
53
48
 
54
49
    def test_ls_basic(self):
55
50
        """Test the abilities of 'bzr ls'"""
56
51
        self.ls_equals('.bzrignore\na\n')
57
 
        self.ls_equals('.bzrignore\na\n', './')
58
52
        self.ls_equals('?        .bzrignore\n'
59
53
                       '?        a\n',
60
54
                       '--verbose')
63
57
                       '--unknown')
64
58
        self.ls_equals('', '--ignored')
65
59
        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')
 
60
        self.ls_equals('.bzrignore\n'
 
61
                       'a\n',
 
62
                       '--unknown', '--ignored', '--versioned')
 
63
        self.ls_equals('', '--ignored', '--versioned')
75
64
        self.ls_equals('.bzrignore\0a\0', '--null')
76
65
 
77
66
    def test_ls_added(self):
80
69
                       'V        a\n',
81
70
                       '--verbose')
82
71
        self.wt.commit('add')
83
 
 
 
72
        
84
73
        self.build_tree(['subdir/'])
85
74
        self.ls_equals('?        .bzrignore\n'
86
75
                       'V        a\n'
94
83
                       'V        subdir/b\n'
95
84
                       , '--verbose')
96
85
 
97
 
    def test_show_ids(self):
98
 
        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')
113
 
 
114
 
    def test_ls_no_recursive(self):
 
86
    def test_ls_recursive(self):
115
87
        self.build_tree(['subdir/', 'subdir/b'])
116
88
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
117
89
 
118
90
        self.ls_equals('.bzrignore\n'
119
91
                       'a\n'
120
 
                       'subdir/\n'
121
 
                       , recursive=False)
 
92
                       'subdir\n'
 
93
                       , '--non-recursive')
122
94
 
123
95
        self.ls_equals('V        .bzrignore\n'
124
96
                       'V        a\n'
125
97
                       'V        subdir/\n'
126
 
                       , '--verbose', recursive=False)
 
98
                       , '--verbose', '--non-recursive')
127
99
 
128
100
        # Check what happens in a sub-directory
129
101
        os.chdir('subdir')
130
102
        self.ls_equals('b\n')
131
103
        self.ls_equals('b\0'
132
104
                  , '--null')
133
 
        self.ls_equals('subdir/b\n'
 
105
        self.ls_equals('.bzrignore\n'
 
106
                       'a\n'
 
107
                       'subdir\n'
 
108
                       'subdir/b\n'
134
109
                       , '--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)
139
 
 
140
 
    def test_ls_path(self):
141
 
        """If a path is specified, files are listed with that prefix"""
142
 
        self.build_tree(['subdir/', 'subdir/b'])
143
 
        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 ..')
 
110
        self.ls_equals('.bzrignore\0'
 
111
                       'a\0'
 
112
                       'subdir\0'
 
113
                       'subdir/b\0'
 
114
                       , '--from-root', '--null')
 
115
        self.ls_equals('.bzrignore\n'
 
116
                       'a\n'
 
117
                       'subdir\n'
 
118
                       , '--from-root', '--non-recursive')
164
119
 
165
120
    def test_ls_revision(self):
166
121
        self.wt.add(['a'])
169
124
        self.build_tree(['subdir/'])
170
125
 
171
126
        # Check what happens when we supply a specific revision
172
 
        self.ls_equals('a\n', '--revision 1')
 
127
        self.ls_equals('a\n', '--revision', '1')
173
128
        self.ls_equals('V        a\n'
174
 
                       , '--verbose --revision 1')
 
129
                       , '--verbose', '--revision', '1')
175
130
 
176
131
        os.chdir('subdir')
177
 
        self.ls_equals('', '--revision 1')
178
 
 
179
 
    def test_ls_branch(self):
180
 
        """If a branch is specified, files are listed from it"""
181
 
        self.build_tree(['subdir/', 'subdir/b'])
182
 
        self.wt.add(['subdir', 'subdir/b'])
183
 
        self.wt.commit('committing')
184
 
        branch = self.make_branch('branchdir')
185
 
        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')
 
132
        self.ls_equals('', '--revision', '1')
192
133
 
193
134
    def test_ls_ignored(self):
194
135
        # Now try to do ignored files.
215
156
        self.ls_equals('.bzrignore\n'
216
157
                       'a\n'
217
158
                       , '--versioned')
218
 
        self.ls_equals('.bzrignore\n'
219
 
                       'a\n'
220
 
                       , '-V')
221
 
 
222
 
    def test_kinds(self):
223
 
        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')
232
 
 
233
 
    def test_ls_path_nonrecursive(self):
234
 
        self.ls_equals('%s/.bzrignore\n'
235
 
                       '%s/a\n'
236
 
                       % (self.test_dir, self.test_dir),
237
 
                       self.test_dir, recursive=False)
 
159