/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-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

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