← 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: Martin Pool
  • Date: 2011-06-14 01:26:41 UTC
  • mto: (6034.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 6043.
  • Revision ID: mbp@canonical.com-20110614012641-dnb69zb57ae5je4w
Move all test features into bzrlib.tests.features

Show diffs side-by-side

added added

removed removed

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