← 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: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
129
129
        self.ls_equals('b\n')
130
130
        self.ls_equals('b\0'
131
131
                  , '--null')
132
 
        self.ls_equals('subdir/b\n'
 
132
        self.ls_equals('.bzrignore\n'
 
133
                       'a\n'
 
134
                       'subdir/\n'
 
135
                       'subdir/b\n'
133
136
                       , '--from-root')
134
 
        self.ls_equals('subdir/b\0'
 
137
        self.ls_equals('.bzrignore\0'
 
138
                       'a\0'
 
139
                       'subdir\0'
 
140
                       'subdir/b\0'
135
141
                       , '--from-root --null')
136
 
        self.ls_equals('subdir/b\n'
 
142
        self.ls_equals('.bzrignore\n'
 
143
                       'a\n'
 
144
                       'subdir/\n'
137
145
                       , '--from-root', recursive=False)
138
146
 
139
147
    def test_ls_path(self):
158
166
                       'V        ../subdir/\n'
159
167
                       'V        ../subdir/b\n' ,
160
168
                       '.. --verbose')
161
 
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
 
169
        self.run_bzr_error('cannot specify both --from-root and PATH',
162
170
                           'ls --from-root ..')
163
171
 
164
172
    def test_ls_revision(self):
227
235
                       '--kind=directory')
228
236
        self.ls_equals('',
229
237
                       '--kind=symlink')
230
 
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
238
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
231
239
 
232
240
    def test_ls_path_nonrecursive(self):
233
241
        self.ls_equals('%s/.bzrignore\n'