/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 bzrlib/tests/blackbox/test_ls.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-08 13:39:32 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-20090508133932-4fbx4z8fvraeyjdy
Fixed as per John's and Markus reviews.

* bzrlib/tests/blackbox/test_push.py:
(TestPush.test_push_with_revisionspec): Fix wrong run_bzr_error
call. Additionnally the error regexp was wrong !

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.test_ls_path, TestLS.test_kinds): Fix wrong run_bzr_error
calls.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Add a check to catch errors in error_regexes
usage where people use a a string that it then iterated char by
char for matching (which is most certainly not the intent of the
test writer).

* bzrlib/tests/blackbox/test_log.py:
Fix run_bzr_error calls. Fix some white spaces issues (some
expected strings were using TABs and were wrongly caught by
test_coding_style(), but fixing the strings wasn't really a
problem either.

Show diffs side-by-side

added added

removed removed

Lines of Context:
166
166
                       'V        ../subdir/\n'
167
167
                       'V        ../subdir/b\n' ,
168
168
                       '.. --verbose')
169
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
169
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
170
170
                           'ls --from-root ..')
171
171
 
172
172
    def test_ls_revision(self):
235
235
                       '--kind=directory')
236
236
        self.ls_equals('',
237
237
                       '--kind=symlink')
238
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
238
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
239
239
 
240
240
    def test_ls_path_nonrecursive(self):
241
241
        self.ls_equals('%s/.bzrignore\n'