← 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: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

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
 
    )
22
19
from bzrlib.tests import TestNotApplicable
23
20
from bzrlib.transform import TreeTransform
24
21
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
44
41
        tree.lock_read()
45
42
        self.addCleanup(tree.unlock)
46
43
        self.assertEqual('subtree-revision',
47
 
            tree.root_inventory['subtree-id'].reference_revision)
 
44
            tree.inventory['subtree-id'].reference_revision)
48
45
 
49
46
    def test_extract_while_locked(self):
50
47
        tree = self.make_branch_and_tree('.')
68
65
 
69
66
    def test_comparison_data_does_not_autodetect_subtree(self):
70
67
        tree = self.prepare_with_subtree()
71
 
        ie = inventory.InventoryDirectory('subtree-id', 'subtree',
72
 
                                          tree.path2id(''))
 
68
        entry = tree.iter_entries_by_dir(['subtree-id']).next()[1]
73
69
        self.assertEqual('directory',
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)
 
70
                         tree._comparison_data(entry, 'subtree')[0])