← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-10-16 14:20:03 UTC
  • mto: This revision was merged to the branch mainline in revision 6220.
  • Revision ID: jelmer@samba.org-20111016142003-tj73pagohoxp37y3
Skip bzr-specific test against other formats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_reconcile.py
17
17
"""Tests for branch implementations - test reconcile() functionality"""
18
18
 
19
19
from bzrlib import errors, reconcile
 
20
from bzrlib.branch import BzrBranch
20
21
from bzrlib.symbol_versioning import deprecated_in
21
22
from bzrlib.tests.per_branch import TestCaseWithBranch
22
23
from bzrlib.tests import TestNotApplicable
25
26
class TestBranchReconcile(TestCaseWithBranch):
26
27
 
27
28
    def test_reconcile_fixes_invalid_revhistory(self):
 
29
        if not isinstance(self.branch_format, BzrBranch):
 
30
            raise TestNotApplicable("test only applies to bzr formats")
28
31
        # Different formats have different ways of handling invalid revision
29
32
        # histories, so the setup portion is customized
30
33
        tree = self.make_branch_and_tree('test')