← Back to branch summary

~bzr/ubuntu/maverick/bzr/bzr-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/test_compare.py

  • Committer: Max Bowsher
  • Date: 2012-03-11 00:18:38 UTC
  • mfrom: (144.1.23 natty)
  • Revision ID: _@maxb.eu-20120311001838-orc0v5vksuqp0431
Tags: 2.5.0-2~bazaar1~maverick1
Merge 2.5

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,
27
26
    )
28
 
from bzrlib.osutils import file_kind, has_symlinks
29
 
from bzrlib.tests import TestNotApplicable
 
27
from bzrlib.osutils import has_symlinks
30
28
from bzrlib.tests.per_intertree import TestCaseWithTwoTrees
 
29
from bzrlib.tests import (
 
30
    features,
 
31
    )
31
32
 
32
33
# TODO: test the include_root option.
33
34
# TODO: test that renaming a directory x->y does not emit a rename for the
963
964
        # To add confusion, the totally generic code path works - but it
964
965
        # doesn't update persistent metadata. So this test permits InterTrees
965
966
        # to either work, or fail with BadFileKindError.
966
 
        self.requireFeature(tests.OsFifoFeature)
 
967
        self.requireFeature(features.OsFifoFeature)
967
968
        tree1 = self.make_branch_and_tree('1')
968
969
        self.build_tree(['1/a'])
969
970
        tree1.set_root_id('root-id')
1368
1369
        return self.mutable_trees_to_locked_test_trees(tree1, tree2)
1369
1370
 
1370
1371
    def test_versioned_symlinks(self):
1371
 
        self.requireFeature(tests.SymlinkFeature)
 
1372
        self.requireFeature(features.SymlinkFeature)
1372
1373
        tree1, tree2 = self.make_trees_with_symlinks()
1373
1374
        self.not_applicable_if_cannot_represent_unversioned(tree2)
1374
1375
        root_id = tree1.path2id('')
1391
1392
        self.check_has_changes(True, tree1, tree2)
1392
1393
 
1393
1394
    def test_versioned_symlinks_specific_files(self):
1394
 
        self.requireFeature(tests.SymlinkFeature)
 
1395
        self.requireFeature(features.SymlinkFeature)
1395
1396
        tree1, tree2 = self.make_trees_with_symlinks()
1396
1397
        root_id = tree1.path2id('')
1397
1398
        expected = [