← 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

(gz) Remove bzrlib/util/effbot/ package (Martin Packman)

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
377
377
    def test_pull_verbose_uses_default_log(self):
378
378
        tree = self.example_branch('source')
379
379
        target = self.make_branch_and_tree('target')
380
 
        target_config = target.branch.get_config()
381
 
        target_config.set_user_option('log_format', 'short')
 
380
        target_config = target.branch.get_config_stack()
 
381
        target_config.set('log_format', 'short')
382
382
        out = self.run_bzr('pull -v source -d target')[0]
383
383
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
384
384
        self.assertNotContainsRe(
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