/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: Martin Pool
  • Date: 2009-09-14 01:48:28 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914014828-ydr9rlkdfq2sv57z
Merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
23
23
    branch,
24
24
    builtins,
25
25
    bzrdir,
 
26
    check,
26
27
    debug,
27
28
    errors,
28
29
    push,
230
231
        # fulltext record for f-id @ rev-1, then this will fail.
231
232
        remote_branch = Branch.open(self.get_url('remote'))
232
233
        trunk.push(remote_branch)
233
 
        remote_branch.check()
 
234
        check.check_dwim(remote_branch.base, False, True, True)
234
235
 
235
236
    def test_no_get_parent_map_after_insert_stream(self):
236
237
        # Effort test for bug 331823
266
267
        self.assertFalse(local.is_locked())
267
268
        local.push(remote)
268
269
        hpss_call_names = [item.call.method for item in self.hpss_calls]
269
 
        self.assertTrue('Repository.insert_stream' in hpss_call_names)
270
 
        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')
271
273
        calls_after_insert_stream = hpss_call_names[insert_stream_idx:]
272
274
        # After inserting the stream the client has no reason to query the
273
275
        # remote graph any further.
274
276
        self.assertEqual(
275
 
            ['Repository.insert_stream', 'Repository.insert_stream', 'get',
276
 
             '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'],
277
279
            calls_after_insert_stream)
278
280
 
279
281
    def disableOptimisticGetParentMap(self):