← 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: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
155
155
        # Make a source, sprout a target off it
156
156
        builder = self.make_branch_builder('source')
157
157
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
158
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
158
        source.get_config_stack().set('branch.fetch_tags', True)
159
159
        target_bzrdir = source.bzrdir.sprout('target')
160
160
        source.tags.set_tag('tag-a', 'rev-2')
161
161
        # Pull from source
421
421
        # become necessary for this use case. Please do not adjust this number
422
422
        # upwards without agreement from bzr's network support maintainers.
423
423
        self.assertLength(19, self.hpss_calls)
 
424
        self.assertLength(1, self.hpss_connections)
424
425
        remote = Branch.open('stacked')
425
426
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
426
427