/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/blackbox/test_reference.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/blackbox/test_reference.py
27
27
class TestReference(TestCaseWithTransport):
28
28
 
29
29
    def get_default_format(self):
30
 
        format = controldir.format_registry.make_bzrdir('1.9')
 
30
        format = controldir.format_registry.make_controldir('1.9')
31
31
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
32
32
        return format
33
33
 
57
57
    def test_uses_basis_tree_location(self):
58
58
        tree = self.make_tree_with_reference()
59
59
        tree.commit('add newpath')
60
 
        tree.bzrdir.destroy_workingtree()
 
60
        tree.controldir.destroy_workingtree()
61
61
        out, err = self.run_bzr('reference', working_dir='tree')
62
62
        self.assertContainsRe(out, 'newpath http://example.org\n')
63
63