← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_push.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-29 16:21:13 UTC
  • mfrom: (5325 +trunk)
  • mto: (5247.1.12 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100629162113-xa6y33u17mfi024v
Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
19
19
from cStringIO import StringIO
20
20
import os
21
21
 
 
22
from testtools.matchers import (
 
23
    Equals,
 
24
    MatchesAny,
 
25
    )
 
26
 
22
27
from bzrlib import (
23
28
    branch,
24
29
    builtins,
271
276
        calls_after_insert_stream = hpss_call_names[insert_stream_idx:]
272
277
        # After inserting the stream the client has no reason to query the
273
278
        # remote graph any further.
274
 
        self.assertEqual(
275
 
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
276
 
             'get', 'Branch.set_last_revision_info', 'Branch.unlock'],
277
 
            calls_after_insert_stream)
 
279
        bzr_core_trace = Equals(
 
280
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
 
281
             'get', 'Branch.set_last_revision_info', 'Branch.unlock'])
 
282
        bzr_loom_trace = Equals(
 
283
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
 
284
             'get', 'Branch.set_last_revision_info', 'get', 'Branch.unlock'])
 
285
        self.assertThat(calls_after_insert_stream,
 
286
            MatchesAny(bzr_core_trace, bzr_loom_trace))
278
287
 
279
288
    def disableOptimisticGetParentMap(self):
280
289
        # Tweak some class variables to stop remote get_parent_map calls asking