← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_stacking.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-06 02:23:37 UTC
  • mfrom: (4332.3.36 check)
  • Revision ID: pqm@pqm.ubuntu.com-20090806022337-7c2oni07fsjq6gun
(robertc) Partial overhaul of check to do less duplicate work.
        (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
19
19
from bzrlib import (
20
20
    branch,
21
21
    bzrdir,
 
22
    check,
22
23
    errors,
23
24
    )
24
25
from bzrlib.revision import NULL_REVISION
360
361
            self.build_tree_contents([('stacked/a', ''.join(text_lines))])
361
362
            stacked_tree.commit('commit %d' % i)
362
363
        stacked_tree.branch.repository.pack()
363
 
        stacked_tree.branch.check()
 
364
        check.check_dwim(stacked_tree.branch.base, False, True, True)
364
365
 
365
366
    def test_pull_delta_when_stacked(self):
366
367
        if not self.branch_format.supports_stacking():
384
385
        # bug 252821 caused a RevisionNotPresent here...
385
386
        stacked_tree.pull(other_tree.branch)
386
387
        stacked_tree.branch.repository.pack()
387
 
        stacked_tree.branch.check()
 
388
        check.check_dwim(stacked_tree.branch.base, False, True, True)
388
389
        self.check_lines_added_or_present(stacked_tree.branch, stacked_revid)
389
390
 
390
391
    def test_fetch_revisions_with_file_changes(self):