/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: Martin
  • Date: 2017-06-11 14:25:36 UTC
  • mto: This revision was merged to the branch mainline in revision 6688.
  • Revision ID: gzlist@googlemail.com-20170611142536-8la6fegm5f3s7e5r
Finish making rio module string usage work on Python 3

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_reference.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from bzrlib import (
19
 
    branch as _mod_branch,
20
 
    bzrdir,
 
18
from breezy import (
 
19
    bzrbranch as _mod_bzrbranch,
 
20
    controldir,
21
21
    )
22
 
from bzrlib.tests import TestCaseWithTransport
 
22
from breezy.tests import TestCaseWithTransport
23
23
 
24
24
 
25
25
class TestReference(TestCaseWithTransport):
26
26
 
27
 
    def make_branch(self, location, format=None):
28
 
        if format is None:
29
 
            format = bzrdir.format_registry.make_bzrdir('1.9')
30
 
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
31
 
        return TestCaseWithTransport.make_branch(self, location, format=format)
 
27
    def get_default_format(self):
 
28
        format = controldir.format_registry.make_controldir('1.9')
 
29
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
 
30
        return format
32
31
 
33
32
    def test_no_args_lists(self):
34
33
        branch = self.make_branch('branch')
56
55
    def test_uses_basis_tree_location(self):
57
56
        tree = self.make_tree_with_reference()
58
57
        tree.commit('add newpath')
59
 
        tree.bzrdir.destroy_workingtree()
 
58
        tree.controldir.destroy_workingtree()
60
59
        out, err = self.run_bzr('reference', working_dir='tree')
61
60
        self.assertContainsRe(out, 'newpath http://example.org\n')
62
61
 
85
84
        tree = self.make_branch_and_tree('tree')
86
85
        out, err = self.run_bzr('reference file http://example.org',
87
86
                                working_dir='tree', retcode=3)
88
 
        self.assertEqual('bzr: ERROR: file is not versioned.\n', err)
 
87
        self.assertEqual('brz: ERROR: file is not versioned.\n', err)