~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: Ian Clatworthy
  • Date: 2008-07-04 03:29:14 UTC
  • mfrom: (3015.3.59 check)
  • mto: This revision was merged to the branch mainline in revision 3521.
  • Revision ID: ian.clatworthy@canonical.com-20080704032914-ymz2feecr4qxe160
Fix check to understand split up .bzr format (Daniel Mark Watkins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
    workingtree,
37
37
    )
38
38
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
39
 
from bzrlib.check import check
 
39
from bzrlib.check import check_branch
40
40
from bzrlib.errors import (FileExists,
41
41
                           NoSuchRevision,
42
42
                           NoSuchFile,
1484
1484
            finally:
1485
1485
                pb.finished()
1486
1486
            # and it should pass 'check' now.
1487
 
            check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)
 
1487
            check_branch(bzrdir.BzrDir.open(self.get_url('.')).open_branch(),
 
1488
                         False)
1488
1489
 
1489
1490
    def test_format_description(self):
1490
1491
        dir = self.make_bzrdir('.')