← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-16 15:29:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5987.
  • Revision ID: jelmer@samba.org-20110616152910-g33fj0rbpngw9r7j
Use matchers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
27
27
    )
28
28
from bzrlib.revision import NULL_REVISION
29
29
from bzrlib.tests import TestCase, TestCaseWithTransport
30
 
from bzrlib.trace import mutter
 
30
from bzrlib.tests.matchers import MatchesAncestry
31
31
 
32
32
# We're allowed to test deprecated interfaces
33
33
warnings.filterwarnings('ignore',
116
116
                    continue
117
117
                if rev_id in br2_only and not branch is br2:
118
118
                    continue
119
 
                mutter('ancestry of {%s}: %r',
120
 
                       rev_id, branch.repository.get_ancestry(rev_id))
121
 
                result = sorted(branch.repository.get_ancestry(rev_id))
122
 
                self.assertEquals(result, [None] + sorted(anc))
 
119
                self.assertThat(anc,
 
120
                    MatchesAncestry(branch.repository, rev_id))
123
121
 
124
122
 
125
123
class TestIntermediateRevisions(TestCaseWithTransport):