← 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

https://launchpad.net/bugs/524184
NEWS section template into a separate file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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):
 
39
    def ls_equals(self, value, args=None, recursive=True):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
 
43
        if recursive:
 
44
            command += ' -R'
43
45
        out, err = self.run_bzr(command)
44
46
        self.assertEqual('', err)
45
47
        self.assertEqualDiff(value, out)
77
79
                       'V        a\n',
78
80
                       '--verbose')
79
81
        self.wt.commit('add')
80
 
        
 
82
 
81
83
        self.build_tree(['subdir/'])
82
84
        self.ls_equals('?        .bzrignore\n'
83
85
                       'V        a\n'
97
99
        self.ls_equals(
98
100
            '.bzrignore                                         \n'
99
101
            'a                                                  a-id\n'
100
 
            'subdir                                             subdir-id\n', 
 
102
            'subdir/                                            subdir-id\n',
101
103
            '--show-ids')
102
104
        self.ls_equals(
103
105
            '?        .bzrignore\n'
104
106
            'V        a                                         a-id\n'
105
 
            'V        subdir/                                   subdir-id\n', 
 
107
            'V        subdir/                                   subdir-id\n',
106
108
            '--show-ids --verbose')
107
109
        self.ls_equals('.bzrignore\0\0'
108
110
                       'a\0a-id\0'
109
111
                       'subdir\0subdir-id\0', '--show-ids --null')
110
112
 
111
 
    def test_ls_recursive(self):
 
113
    def test_ls_no_recursive(self):
112
114
        self.build_tree(['subdir/', 'subdir/b'])
113
115
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
114
116
 
115
117
        self.ls_equals('.bzrignore\n'
116
118
                       'a\n'
117
 
                       'subdir\n'
118
 
                       , '--non-recursive')
 
119
                       'subdir/\n'
 
120
                       , recursive=False)
119
121
 
120
122
        self.ls_equals('V        .bzrignore\n'
121
123
                       'V        a\n'
122
124
                       'V        subdir/\n'
123
 
                       , '--verbose --non-recursive')
 
125
                       , '--verbose', recursive=False)
124
126
 
125
127
        # Check what happens in a sub-directory
126
128
        os.chdir('subdir')
127
129
        self.ls_equals('b\n')
128
130
        self.ls_equals('b\0'
129
131
                  , '--null')
130
 
        self.ls_equals('.bzrignore\n'
131
 
                       'a\n'
132
 
                       'subdir\n'
133
 
                       'subdir/b\n'
 
132
        self.ls_equals('subdir/b\n'
134
133
                       , '--from-root')
135
 
        self.ls_equals('.bzrignore\0'
136
 
                       'a\0'
137
 
                       'subdir\0'
138
 
                       'subdir/b\0'
 
134
        self.ls_equals('subdir/b\0'
139
135
                       , '--from-root --null')
140
 
        self.ls_equals('.bzrignore\n'
141
 
                       'a\n'
142
 
                       'subdir\n'
143
 
                       , '--from-root --non-recursive')
 
136
        self.ls_equals('subdir/b\n'
 
137
                       , '--from-root', recursive=False)
144
138
 
145
139
    def test_ls_path(self):
146
140
        """If a path is specified, files are listed with that prefix"""
151
145
        os.chdir('subdir')
152
146
        self.ls_equals('../.bzrignore\n'
153
147
                       '../a\n'
154
 
                       '../subdir\n'
 
148
                       '../subdir/\n'
155
149
                       '../subdir/b\n' ,
156
150
                       '..')
157
151
        self.ls_equals('../.bzrignore\0'
164
158
                       'V        ../subdir/\n'
165
159
                       'V        ../subdir/b\n' ,
166
160
                       '.. --verbose')
167
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
161
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
168
162
                           'ls --from-root ..')
169
163
 
170
164
    def test_ls_revision(self):
188
182
        self.wt.commit('committing')
189
183
        branch = self.make_branch('branchdir')
190
184
        branch.pull(self.wt.branch)
191
 
        self.ls_equals('branchdir/subdir\n'
 
185
        self.ls_equals('branchdir/subdir/\n'
192
186
                       'branchdir/subdir/b\n',
193
187
                       'branchdir')
194
 
        self.ls_equals('branchdir/subdir\n'
 
188
        self.ls_equals('branchdir/subdir/\n'
195
189
                       'branchdir/subdir/b\n',
196
190
                       'branchdir --revision 1')
197
191
 
226
220
 
227
221
    def test_kinds(self):
228
222
        self.build_tree(['subdir/'])
229
 
        self.ls_equals('.bzrignore\n' 
230
 
                       'a\n', 
 
223
        self.ls_equals('.bzrignore\n'
 
224
                       'a\n',
231
225
                       '--kind=file')
232
 
        self.ls_equals('subdir\n',
 
226
        self.ls_equals('subdir/\n',
233
227
                       '--kind=directory')
234
228
        self.ls_equals('',
235
229
                       '--kind=symlink')
236
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
230
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
231
 
 
232
    def test_ls_path_nonrecursive(self):
 
233
        self.ls_equals('%s/.bzrignore\n'
 
234
                       '%s/a\n'
 
235
                       % (self.test_dir, self.test_dir),
 
236
                       self.test_dir, recursive=False)