/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: Martin Pool
  • Date: 2009-08-20 05:02:45 UTC
  • mfrom: (4615 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4632.
  • Revision ID: mbp@sourcefrog.net-20090820050245-o7cw6nxrzh1eah8h
News for apport feature

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,
528
528
        self.assertEqual('1', target.open_branch().last_revision())
529
529
 
530
530
    def test_clone_bzrdir_tree_branch_repo(self):
 
531
        self.thisFailsStrictLockCheck()
531
532
        tree = self.make_branch_and_tree('source')
532
533
        self.build_tree(['source/foo'])
533
534
        tree.add('foo')
568
569
        self.assertEqual(target_repo._format, source_branch.repository._format)
569
570
 
570
571
    def test_revert_inventory(self):
 
572
        self.thisFailsStrictLockCheck()
571
573
        tree = self.make_branch_and_tree('source')
572
574
        self.build_tree(['source/foo'])
573
575
        tree.add('foo')
622
624
                                     ])
623
625
 
624
626
    def test_clone_bzrdir_tree_revision(self):
 
627
        self.thisFailsStrictLockCheck()
625
628
        # test for revision limiting, [smoke test, not corner case checks].
626
629
        # make a tree with a revision with a last-revision
627
630
        # and clone it with a revision limit.
1738
1741
            finally:
1739
1742
                pb.finished()
1740
1743
            # and it should pass 'check' now.
1741
 
            check_branch(bzrdir.BzrDir.open(self.get_url('.')).open_branch(),
1742
 
                         False)
 
1744
            check.check_dwim(self.get_url('.'), False, True, True)
1743
1745
 
1744
1746
    def test_format_description(self):
1745
1747
        dir = self.make_bzrdir('.')