/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/test_upgrade_stacked.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:
bzrlib/tests/test_upgrade_stacked.py
19
19
 
20
20
from bzrlib import (
21
21
    bzrdir,
22
 
    check,
23
22
    errors,
24
23
    tests,
25
24
    )
57
56
            self.assertRaises(errors.IncompatibleRepositories,
58
57
                stacked.open_branch)
59
58
        else:
60
 
            check.check_dwim('stacked', False, True, True)
 
59
            stacked.open_branch().check()
61
60
        stacked = bzrdir.BzrDir.open('stacked')
62
61
        # but we can upgrade the stacked repository
63
62
        upgrade('stacked', new_format)
64
 
        # and now it opens ok
 
63
        # and now it's ok
65
64
        stacked = bzrdir.BzrDir.open('stacked')
66
 
        # And passes check.
67
 
        check.check_dwim('stacked', False, True, True)
 
65
        stacked.open_branch().check()
68
66
 
69
67
 
70
68
def load_tests(basic_tests, module, loader):