/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_branch/test_push.py

  • Committer: Martin
  • Date: 2009-11-07 08:02:13 UTC
  • mfrom: (4789 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4809.
  • Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
261
261
        self.assertFalse(local.is_locked())
262
262
        local.push(remote)
263
263
        hpss_call_names = [item.call.method for item in self.hpss_calls]
264
 
        self.assertTrue('Repository.insert_stream' in hpss_call_names)
265
 
        insert_stream_idx = hpss_call_names.index('Repository.insert_stream')
 
264
        self.assertTrue('Repository.insert_stream_1.19' in hpss_call_names)
 
265
        insert_stream_idx = hpss_call_names.index(
 
266
            'Repository.insert_stream_1.19')
266
267
        calls_after_insert_stream = hpss_call_names[insert_stream_idx:]
267
268
        # After inserting the stream the client has no reason to query the
268
269
        # remote graph any further.
269
270
        self.assertEqual(
270
 
            ['Repository.insert_stream', 'Repository.insert_stream', 'get',
271
 
             'Branch.set_last_revision_info', 'Branch.unlock'],
 
271
            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
 
272
             'get', 'Branch.set_last_revision_info', 'Branch.unlock'],
272
273
            calls_after_insert_stream)
273
274
 
274
275
    def disableOptimisticGetParentMap(self):
393
394
        # Create a smart server that publishes whatever the backing VFS server
394
395
        # does.
395
396
        self.smart_server = server.SmartTCPServer_for_testing()
396
 
        self.smart_server.setUp(self.get_server())
397
 
        self.addCleanup(self.smart_server.tearDown)
 
397
        self.start_server(self.smart_server, self.get_server())
398
398
        # Make two empty branches, 'empty' and 'target'.
399
399
        self.empty_branch = self.make_branch('empty')
400
400
        self.make_branch('target')
413
413
        target = Branch.open_from_transport(transport)
414
414
        self.empty_branch.push(target)
415
415
        self.assertEqual(
416
 
            ['BzrDir.open',
 
416
            ['BzrDir.open_2.1',
417
417
             'BzrDir.open_branchV2',
418
418
             'BzrDir.find_repositoryV3',
419
419
             'Branch.get_stacked_on_url',