/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 breezy/tests/test_config.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_config.py
163
163
    # creating a dedicated helper to create only the bzrdir
164
164
    build_backing_branch(test, 'branch', transport_class, server_class)
165
165
    b = branch.Branch.open(test.get_url('branch'))
166
 
    return config.RemoteControlStack(b.bzrdir)
 
166
    return config.RemoteControlStack(b.controldir)
167
167
config.test_stack_builder_registry.register('remote_control',
168
168
                                            build_remote_control_stack)
169
169
 
1654
1654
        self.assertEqual(value, 'value3-section')
1655
1655
 
1656
1656
    def test_set_unset_default_stack_on(self):
1657
 
        my_dir = self.make_bzrdir('.')
 
1657
        my_dir = self.make_controldir('.')
1658
1658
        bzrdir_config = config.BzrDirConfig(my_dir)
1659
1659
        self.assertIs(None, bzrdir_config.get_default_stack_on())
1660
1660
        bzrdir_config.set_default_stack_on('Foo')