/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_workingtree/test_nested_specifics.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_workingtree/test_nested_specifics.py
18
18
 
19
19
from breezy.bzr import (
20
20
    inventory,
 
21
    inventorytree,
21
22
    )
22
23
from breezy.tests import TestNotApplicable
23
24
from breezy.transform import TreeTransform
32
33
            raise TestNotApplicable('Tree references not supported')
33
34
        return tree
34
35
 
35
 
    def test_set_get_tree_reference(self):
 
36
    def test_set_get_inventory_tree_reference(self):
36
37
        """This tests that setting a tree reference is persistent."""
37
38
        tree = self.make_branch_and_tree('.')
 
39
        if not isinstance(tree, inventorytree.InventoryTree):
 
40
            raise TestNotApplicable('not an inventory tree')
38
41
        transform = TreeTransform(tree)
39
42
        trans_id = transform.new_directory('reference', transform.root,
40
 
            'subtree-id')
41
 
        transform.set_tree_reference('subtree-revision', trans_id)
 
43
            b'subtree-id')
 
44
        transform.set_tree_reference(b'subtree-revision', trans_id)
42
45
        transform.apply()
43
46
        tree = tree.controldir.open_workingtree()
44
47
        tree.lock_read()
59
62
        tree.lock_write()
60
63
        self.addCleanup(tree.unlock)
61
64
        subtree = self.make_branch_and_tree('subtree')
62
 
        tree.add(['subtree'], [b'subtree-id'])
 
65
        subtree.commit('dummy')
 
66
        tree.add(['subtree'])
63
67
        return tree
64
68
 
65
 
    def test_kind_does_not_autodetect_subtree(self):
66
 
        tree = self.prepare_with_subtree()
67
 
        self.assertEqual('directory', tree.kind('subtree', b'subtree-id'))
68
 
 
69
69
    def test_comparison_data_does_not_autodetect_subtree(self):
70
70
        tree = self.prepare_with_subtree()
71
71
        ie = inventory.InventoryDirectory(b'subtree-id', 'subtree',
73
73
        self.assertEqual('directory',
74
74
                         tree._comparison_data(ie, 'subtree')[0])
75
75
 
76
 
    def test_inventory_does_not_autodetect_subtree(self):
 
76
    def test_may_not_autodetect_subtree(self):
77
77
        tree = self.prepare_with_subtree()
78
 
        self.assertEqual('directory', tree.kind('subtree', 'subtree-id'))
 
78
        self.assertIn(tree.kind('subtree'), ('directory', 'tree-reference'))
79
79
 
80
80
    def test_iter_entries_by_dir_autodetects_subtree(self):
81
81
        tree = self.prepare_with_subtree()