/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: Alexander Belchenko
  • Date: 2007-03-13 02:12:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2356.
  • Revision ID: bialix@ukr.net-20070313021211-su48tjggdkklec47
Cleanup patch after John's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 
22
22
from bzrlib import errors, tests, workingtree_4
23
23
from bzrlib.osutils import file_kind, has_symlinks
24
 
from bzrlib.tests import TestSkipped
25
24
from bzrlib.tests.intertree_implementations import TestCaseWithTwoTrees
26
25
 
27
26
# TODO: test the include_root option.
930
929
 
931
930
    def test_versioned_symlinks(self):
932
931
        if not has_symlinks():
933
 
            raise TestSkipped("No symlink support")
 
932
            raise tests.TestSkipped("No symlink support")
934
933
        tree1, tree2 = self.make_trees_with_symlinks()
935
934
        root_id = tree1.path2id('')
936
935
        tree1.lock_read()
956
955
 
957
956
    def test_versioned_symlinks_specific_files(self):
958
957
        if not has_symlinks():
959
 
            raise TestSkipped("No symlink support")
 
958
            raise tests.TestSkipped("No symlink support")
960
959
        tree1, tree2 = self.make_trees_with_symlinks()
961
960
        root_id = tree1.path2id('')
962
961
        tree1.lock_read()