← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.py

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
368
368
        See <https://launchpad.net/bugs/380314>
369
369
        """
370
370
        self.setup_smart_server_with_call_log()
 
371
        # Make a stacked-on branch with two commits so that the
 
372
        # revision-history can't be determined just by looking at the parent
 
373
        # field in the revision in the stacked repo.
371
374
        parent = self.make_branch_and_tree('parent', format='1.9')
372
375
        parent.commit(message='first commit')
 
376
        parent.commit(message='second commit')
373
377
        local = parent.bzrdir.sprout('local').open_workingtree()
374
378
        local.commit(message='local commit')
375
379
        local.branch.create_clone_on_transport(
383
387
        # being too low. If rpc_count increases, more network roundtrips have
384
388
        # become necessary for this use case. Please do not adjust this number
385
389
        # upwards without agreement from bzr's network support maintainers.
386
 
        self.assertLength(43, self.hpss_calls)
 
390
        self.assertLength(18, self.hpss_calls)
387
391
        remote = Branch.open('stacked')
388
392
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
389
393