← 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: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

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',
104
104
             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
105
105
                          'b@u-0-3', 'b@u-0-4',
106
106
                          'b@u-0-5', 'a@u-0-5']),
107
 
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
 
107
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-4',
108
108
                          'b@u-0-3', 'b@u-0-4',
109
109
                          'b@u-0-5', 'b@u-0-6']),
110
110
             ]
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):