← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/test_compare.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_intertree/test_compare.py
23
23
    errors,
24
24
    mutabletree,
25
25
    tests,
 
26
    workingtree_4,
26
27
    )
27
 
from bzrlib.osutils import has_symlinks
 
28
from bzrlib.osutils import file_kind, has_symlinks
 
29
from bzrlib.tests import TestNotApplicable
28
30
from bzrlib.tests.per_intertree import TestCaseWithTwoTrees
29
 
from bzrlib.tests import (
30
 
    features,
31
 
    )
32
31
 
33
32
# TODO: test the include_root option.
34
33
# TODO: test that renaming a directory x->y does not emit a rename for the
542
541
            (from_basename, to_basename), (kind, None), (False, False))
543
542
 
544
543
    def deleted(self, tree, file_id):
545
 
        entry = tree.root_inventory[file_id]
 
544
        entry = tree.inventory[file_id]
546
545
        path = tree.id2path(file_id)
547
546
        return (file_id, (path, None), True, (True, False), (entry.parent_id, None),
548
547
                (entry.name, None), (entry.kind, None),
964
963
        # To add confusion, the totally generic code path works - but it
965
964
        # doesn't update persistent metadata. So this test permits InterTrees
966
965
        # to either work, or fail with BadFileKindError.
967
 
        self.requireFeature(features.OsFifoFeature)
 
966
        self.requireFeature(tests.OsFifoFeature)
968
967
        tree1 = self.make_branch_and_tree('1')
969
968
        self.build_tree(['1/a'])
970
969
        tree1.set_root_id('root-id')
1369
1368
        return self.mutable_trees_to_locked_test_trees(tree1, tree2)
1370
1369
 
1371
1370
    def test_versioned_symlinks(self):
1372
 
        self.requireFeature(features.SymlinkFeature)
 
1371
        self.requireFeature(tests.SymlinkFeature)
1373
1372
        tree1, tree2 = self.make_trees_with_symlinks()
1374
1373
        self.not_applicable_if_cannot_represent_unversioned(tree2)
1375
1374
        root_id = tree1.path2id('')
1392
1391
        self.check_has_changes(True, tree1, tree2)
1393
1392
 
1394
1393
    def test_versioned_symlinks_specific_files(self):
1395
 
        self.requireFeature(features.SymlinkFeature)
 
1394
        self.requireFeature(tests.SymlinkFeature)
1396
1395
        tree1, tree2 = self.make_trees_with_symlinks()
1397
1396
        root_id = tree1.path2id('')
1398
1397
        expected = [