← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_nested_specifics.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_nested_specifics.py
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
 
19
from bzrlib import (
 
20
    inventory,
 
21
    )
19
22
from bzrlib.tests import TestNotApplicable
20
23
from bzrlib.transform import TreeTransform
21
24
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
41
44
        tree.lock_read()
42
45
        self.addCleanup(tree.unlock)
43
46
        self.assertEqual('subtree-revision',
44
 
            tree.inventory['subtree-id'].reference_revision)
 
47
            tree.root_inventory['subtree-id'].reference_revision)
45
48
 
46
49
    def test_extract_while_locked(self):
47
50
        tree = self.make_branch_and_tree('.')
65
68
 
66
69
    def test_comparison_data_does_not_autodetect_subtree(self):
67
70
        tree = self.prepare_with_subtree()
68
 
        entry = tree.iter_entries_by_dir(['subtree-id']).next()[1]
 
71
        ie = inventory.InventoryDirectory('subtree-id', 'subtree',
 
72
                                          tree.path2id(''))
69
73
        self.assertEqual('directory',
70
 
                         tree._comparison_data(entry, 'subtree')[0])
 
74
                         tree._comparison_data(ie, 'subtree')[0])
 
75
 
 
76
    def test_inventory_does_not_autodetect_subtree(self):
 
77
        tree = self.prepare_with_subtree()
 
78
        self.assertEqual('directory', tree.kind('subtree-id'))
 
79
 
 
80
    def test_iter_entries_by_dir_autodetects_subtree(self):
 
81
        tree = self.prepare_with_subtree()
 
82
        path, ie = tree.iter_entries_by_dir(['subtree-id']).next()
 
83
        self.assertEqual('tree-reference', ie.kind)