/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-03 02:37:39 UTC
  • mfrom: (2949.5.2 symlink.feature)
  • Revision ID: pqm@pqm.ubuntu.com-20071103023739-e0wzok4qpvzq66sa
selftest: use SymlinkFeature instead of TestSkipped where appropriate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/intertree_implementations/test_compare.py
953
953
        tree2.set_root_id(tree1.get_root_id())
954
954
        self.build_tree(['tree1/fromfile', 'tree1/fromdir/'])
955
955
        self.build_tree(['tree2/tofile', 'tree2/todir/', 'tree2/unknown'])
956
 
        # try:
957
956
        os.symlink('original', 'tree1/changed')
958
957
        os.symlink('original', 'tree1/removed')
959
958
        os.symlink('original', 'tree1/tofile')
986
985
            ]
987
986
        tree1.add(from_paths_and_ids, from_paths_and_ids)
988
987
        tree2.add(to_paths_and_ids, to_paths_and_ids)
989
 
        # except ???:
990
 
        #   raise TestSkipped('OS does not support symlinks')
991
 
        #   links_supported = False
992
988
        return self.mutable_trees_to_locked_test_trees(tree1, tree2)
993
989
 
994
990
    def test_versioned_symlinks(self):
995
 
        if not has_symlinks():
996
 
            raise tests.TestSkipped("No symlink support")
 
991
        self.requireFeature(tests.SymlinkFeature)
997
992
        tree1, tree2 = self.make_trees_with_symlinks()
998
993
        root_id = tree1.path2id('')
999
994
        expected = [
1014
1009
                want_unversioned=True))
1015
1010
 
1016
1011
    def test_versioned_symlinks_specific_files(self):
1017
 
        if not has_symlinks():
1018
 
            raise tests.TestSkipped("No symlink support")
 
1012
        self.requireFeature(tests.SymlinkFeature)
1019
1013
        tree1, tree2 = self.make_trees_with_symlinks()
1020
1014
        root_id = tree1.path2id('')
1021
1015
        expected = [