← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2009-09-14 01:48:28 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914014828-ydr9rlkdfq2sv57z
Merge news

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,
1255
1255
        # repository is the same as the external location of the stacked-on
1256
1256
        # branch.
1257
1257
        balloon = self.make_bzrdir('balloon')
1258
 
        if isinstance(balloon, bzrdir.BzrDirMetaFormat1):
 
1258
        if isinstance(balloon._format, bzrdir.BzrDirMetaFormat1):
1259
1259
            stack_on = self.make_branch('stack-on', format='1.9')
1260
1260
        else:
1261
1261
            stack_on = self.make_branch('stack-on')
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('.')