/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/per_tree/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
21
21
    revisiontree,
22
22
    tests,
23
23
    )
 
24
from breezy.tree import MissingNestedTree
24
25
from breezy.bzr import (
25
26
    workingtree_4,
26
27
    )
82
83
 
83
84
    def create_nested(self):
84
85
        work_tree = self.make_branch_and_tree('wt')
85
 
        work_tree.lock_write()
86
 
        try:
 
86
        with work_tree.lock_write():
87
87
            self.skip_if_no_reference(work_tree)
88
88
            subtree = self.make_branch_and_tree('wt/subtree')
89
89
            subtree.commit('foo')
90
90
            work_tree.add_reference(subtree)
91
 
        finally:
92
 
            work_tree.unlock()
93
91
        tree = self._convert_tree(work_tree)
94
92
        self.skip_if_no_reference(tree)
95
93
        return tree, subtree
110
108
            [u'subtree'],
111
109
            list(tree.iter_references()))
112
110
 
 
111
    def test_get_nested_tree(self):
 
112
        tree, subtree = self.create_nested()
 
113
        try:
 
114
            changes = subtree.changes_from(tree.get_nested_tree('subtree'))
 
115
            self.assertFalse(changes.has_changed())
 
116
        except MissingNestedTree:
 
117
            # Also okay.
 
118
            pass
 
119
 
113
120
    def test_get_root_id(self):
114
121
        # trees should return some kind of root id; it can be none
115
122
        tree = self.make_branch_and_tree('tree')