← 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: Jelmer Vernooij
  • Date: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
279
279
        # remote graph any further.
280
280
        bzr_core_trace = Equals(
281
281
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
282
 
             'get', 'Branch.set_last_revision_info', 'Branch.unlock'])
 
282
             'Branch.set_last_revision_info', 'Branch.unlock'])
283
283
        bzr_loom_trace = Equals(
284
284
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
285
 
             'get', 'Branch.set_last_revision_info', 'get', 'Branch.unlock'])
 
285
             'Branch.set_last_revision_info', 'get', 'Branch.unlock'])
286
286
        self.assertThat(calls_after_insert_stream,
287
287
            MatchesAny(bzr_core_trace, bzr_loom_trace))
288
288