/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_info.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:37 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005237-59jdqykbfjo1p37t
Rename make_bzrdir to make_controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_info.py
105
105
        old_format = control._format.workingtree_format
106
106
        try:
107
107
            control._format.workingtree_format = \
108
 
                controldir.format_registry.make_bzrdir(format).workingtree_format
 
108
                controldir.format_registry.make_controldir(format).workingtree_format
109
109
            control.create_workingtree()
110
110
            tree = workingtree.WorkingTree.open('%s_co' % format)
111
111
            format_description = info.describe_format(tree.controldir,
197
197
                expected = '1.14-rich-root'
198
198
            self.assertRepoDescription(key, expected)
199
199
 
200
 
        format = controldir.format_registry.make_bzrdir('knit')
 
200
        format = controldir.format_registry.make_controldir('knit')
201
201
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat6())
202
202
        tree = self.make_branch_and_tree('unknown', format=format)
203
203
        self.assertEqual('unnamed', info.describe_format(tree.controldir,
204
204
            tree.branch.repository, tree.branch, tree))
205
205
 
206
206
    def test_gather_location_controldir_only(self):
207
 
        bzrdir = self.make_bzrdir('.')
 
207
        bzrdir = self.make_controldir('.')
208
208
        self.assertEqual([('control directory', bzrdir.user_url)],
209
209
            info.gather_location_info(control=bzrdir))
210
210