/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2009-08-18 12:49:22 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4630.
  • Revision ID: aaron@aaronbentley.com-20090818124922-amjt054mh5wm0s30
Merge bzr.dev into shelve-lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
267
267
        self.assertFalse(local.is_locked())
268
268
        local.push(remote)
269
269
        hpss_call_names = [item.call.method for item in self.hpss_calls]
270
 
        self.assertTrue('Repository.insert_stream' in hpss_call_names)
271
 
        insert_stream_idx = hpss_call_names.index('Repository.insert_stream')
 
270
        self.assertTrue('Repository.insert_stream_1.19' in hpss_call_names)
 
271
        insert_stream_idx = hpss_call_names.index(
 
272
            'Repository.insert_stream_1.19')
272
273
        calls_after_insert_stream = hpss_call_names[insert_stream_idx:]
273
274
        # After inserting the stream the client has no reason to query the
274
275
        # remote graph any further.
275
276
        self.assertEqual(
276
 
            ['Repository.insert_stream', 'Repository.insert_stream', 'get',
277
 
             'Branch.set_last_revision_info', 'Branch.unlock'],
 
277
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
 
278
             'get', 'Branch.set_last_revision_info', 'Branch.unlock'],
278
279
            calls_after_insert_stream)
279
280
 
280
281
    def disableOptimisticGetParentMap(self):
360
361
            self.hook_calls)
361
362
 
362
363
    def test_post_push_nonempty_history(self):
 
364
        self.thisFailsStrictLockCheck()
363
365
        target = self.make_to_branch_and_tree('target')
364
366
        target.lock_write()
365
367
        target.add('')