/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: 2018-05-07 11:22:07 UTC
  • mfrom: (6951 work)
  • mto: This revision was merged to the branch mainline in revision 6953.
  • Revision ID: jelmer@jelmer.uk-20180507112207-x3kqvmjdzfvmfk2p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
86
86
        try:
87
87
            self.skip_if_no_reference(work_tree)
88
88
            subtree = self.make_branch_and_tree('wt/subtree')
89
 
            subtree.set_root_id(b'sub-root')
90
 
            subtree.commit('foo', rev_id=b'sub-1')
 
89
            subtree.commit('foo')
91
90
            work_tree.add_reference(subtree)
92
91
        finally:
93
92
            work_tree.unlock()
94
93
        tree = self._convert_tree(work_tree)
95
94
        self.skip_if_no_reference(tree)
96
 
        return tree
 
95
        return tree, subtree
97
96
 
98
97
    def test_get_reference_revision(self):
99
 
        tree = self.create_nested()
 
98
        tree, subtree = self.create_nested()
100
99
        tree.lock_read()
101
100
        self.addCleanup(tree.unlock)
102
 
        path = tree.id2path(b'sub-root')
103
 
        self.assertEqual(b'sub-1',
104
 
            tree.get_reference_revision(path, 'sub-root'))
 
101
        self.assertEqual(
 
102
            subtree.last_revision(),
 
103
            tree.get_reference_revision('subtree'))
105
104
 
106
105
    def test_iter_references(self):
107
 
        tree = self.create_nested()
 
106
        tree, subtree = self.create_nested()
108
107
        tree.lock_read()
109
108
        self.addCleanup(tree.unlock)
110
 
        entry = tree.root_inventory.get_entry('sub-root')
111
 
        self.assertEqual([(u'subtree', 'sub-root')],
 
109
        self.assertEqual(
 
110
            [(u'subtree', subtree.get_root_id())],
112
111
            list(tree.iter_references()))
113
112
 
114
113
    def test_get_root_id(self):
368
367
        work_tree = self.make_branch_and_tree('tree')
369
368
        tree = self._convert_tree(work_tree)
370
369
        self.assertSubset([tree.supports_rename_tracking()], (True, False))
 
370
 
 
371
 
 
372
class TestSupportsVersionableKind(TestCaseWithTree):
 
373
 
 
374
    def test_file(self):
 
375
        work_tree = self.make_branch_and_tree('tree')
 
376
        tree = self._convert_tree(work_tree)
 
377
        self.assertTrue(tree.versionable_kind('file'))
 
378
 
 
379
    def test_unknown(self):
 
380
        work_tree = self.make_branch_and_tree('tree')
 
381
        tree = self._convert_tree(work_tree)
 
382
        self.assertFalse(tree.versionable_kind('unknown'))