/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/per_bzrdir/test_bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-07 05:56:29 UTC
  • mfrom: (4595 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090807055629-wkgbne6gf7t284ai
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
26
26
import bzrlib.branch
27
27
from bzrlib import (
28
28
    bzrdir,
 
29
    check,
29
30
    errors,
30
31
    lockdir,
31
32
    osutils,
38
39
    workingtree,
39
40
    )
40
41
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
41
 
from bzrlib.check import check_branch
42
42
from bzrlib.errors import (FileExists,
43
43
                           NoSuchRevision,
44
44
                           NoSuchFile,
1738
1738
            finally:
1739
1739
                pb.finished()
1740
1740
            # and it should pass 'check' now.
1741
 
            check_branch(bzrdir.BzrDir.open(self.get_url('.')).open_branch(),
1742
 
                         False)
 
1741
            check.check_dwim(self.get_url('.'), False, True, True)
1743
1742
 
1744
1743
    def test_format_description(self):
1745
1744
        dir = self.make_bzrdir('.')