← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
152
152
        # Make a source, sprout a target off it
153
153
        builder = self.make_branch_builder('source')
154
154
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
155
        source.get_config().set_user_option('branch.fetch_tags', 'True')
155
156
        target_bzrdir = source.bzrdir.sprout('target')
156
157
        source.tags.set_tag('tag-a', 'rev-2')
157
158
        # Pull from source
410
411
        # being too low. If rpc_count increases, more network roundtrips have
411
412
        # become necessary for this use case. Please do not adjust this number
412
413
        # upwards without agreement from bzr's network support maintainers.
413
 
        self.assertLength(18, self.hpss_calls)
 
414
        self.assertLength(19, self.hpss_calls)
414
415
        remote = Branch.open('stacked')
415
416
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
416
417