/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 brzlib/tests/blackbox/test_reference.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from breezy import (
 
18
from brzlib import (
 
19
    branch as _mod_branch,
19
20
    controldir,
20
21
    )
21
 
from breezy.bzr import (
22
 
    branch as _mod_bzrbranch,
23
 
    )
24
 
from breezy.tests import TestCaseWithTransport
 
22
from brzlib.tests import TestCaseWithTransport
25
23
 
26
24
 
27
25
class TestReference(TestCaseWithTransport):
28
26
 
29
27
    def get_default_format(self):
30
 
        return controldir.format_registry.make_controldir('development-subtree')
 
28
        format = controldir.format_registry.make_bzrdir('1.9')
 
29
        format.set_branch_format(_mod_branch.BzrBranchFormat8())
 
30
        return format
31
31
 
32
32
    def test_no_args_lists(self):
33
 
        tree = self.make_branch_and_tree('branch')
34
 
        branch = tree.branch
35
 
        tree.add_reference(self.make_branch_and_tree('branch/path'))
36
 
        tree.add_reference(self.make_branch_and_tree('branch/lath'))
37
 
        tree.set_reference_info('path', 'http://example.org')
38
 
        tree.set_reference_info('lath', 'http://example.org/2')
 
33
        branch = self.make_branch('branch')
 
34
        branch.set_reference_info('file-id', 'path', 'http://example.org')
 
35
        branch.set_reference_info('file-id2', 'lath', 'http://example.org/2')
39
36
        out, err = self.run_bzr('reference', working_dir='branch')
40
37
        lines = out.splitlines()
41
38
        self.assertEqual('lath http://example.org/2', lines[0])
43
40
 
44
41
    def make_tree_with_reference(self):
45
42
        tree = self.make_branch_and_tree('tree')
46
 
        subtree = self.make_branch_and_tree('tree/newpath')
47
 
        tree.add_reference(subtree)
48
 
        tree.set_reference_info('newpath', 'http://example.org')
49
 
        tree.commit('add reference')
 
43
        self.build_tree(['tree/newpath'])
 
44
        tree.add('newpath', 'file-id')
 
45
        tree.branch.set_reference_info('file-id', 'path', 'http://example.org')
 
46
        tree.branch.set_reference_info('file-id2', 'lath',
 
47
                                       'http://example.org/2')
50
48
        return tree
51
49
 
52
50
    def test_uses_working_tree_location(self):
56
54
 
57
55
    def test_uses_basis_tree_location(self):
58
56
        tree = self.make_tree_with_reference()
59
 
        tree.controldir.destroy_workingtree()
 
57
        tree.commit('add newpath')
 
58
        tree.bzrdir.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
 
67
66
 
68
67
    def test_one_arg_uses_containing_tree(self):
69
68
        tree = self.make_tree_with_reference()
70
 
        out, err = self.run_bzr('reference -d tree newpath')
 
69
        out, err = self.run_bzr('reference tree/newpath')
71
70
        self.assertEqual('newpath http://example.org\n', out)
72
71
 
73
72
    def test_two_args_sets(self):
74
73
        tree = self.make_branch_and_tree('tree')
75
74
        self.build_tree(['tree/file'])
76
 
        tree.add('file')
77
 
        out, err = self.run_bzr('reference -d tree file http://example.org')
78
 
        location = tree.get_reference_info('file')
 
75
        tree.add('file', 'file-id')
 
76
        out, err = self.run_bzr('reference tree/file http://example.org')
 
77
        path, location = tree.branch.get_reference_info('file-id')
79
78
        self.assertEqual('http://example.org', location)
 
79
        self.assertEqual('file', path)
80
80
        self.assertEqual('', out)
81
81
        self.assertEqual('', err)
82
82
 
84
84
        tree = self.make_branch_and_tree('tree')
85
85
        out, err = self.run_bzr('reference file http://example.org',
86
86
                                working_dir='tree', retcode=3)
87
 
        self.assertEqual('brz: ERROR: file is not versioned.\n', err)
88
 
 
89
 
    def test_missing_file_forced(self):
90
 
        tree = self.make_branch_and_tree('tree')
91
 
        tree.add_reference(self.make_branch_and_tree('tree/file'))
92
 
        out, err = self.run_bzr(
93
 
            'reference --force-unversioned file http://example.org',
94
 
            working_dir='tree')
95
 
        location = tree.get_reference_info('file')
96
 
        self.assertEqual('http://example.org', location)
97
 
        self.assertEqual('', out)
98
 
        self.assertEqual('', err)
 
87
        self.assertEqual('bzr: ERROR: file is not versioned.\n', err)