/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/test_transform.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
33
33
                           PathsNotVersionedError, ExistingLimbo,
34
34
                           ExistingPendingDeletion, ImmortalLimbo,
35
35
                           ImmortalPendingDeletion, LockError)
36
 
from bzrlib.osutils import file_kind, has_symlinks, pathjoin
 
36
from bzrlib.osutils import file_kind, pathjoin
37
37
from bzrlib.merge import Merge3Merger
38
 
from bzrlib.tests import TestCaseInTempDir, TestSkipped, TestCase
 
38
from bzrlib.tests import (
 
39
    SymlinkFeature,
 
40
    TestCase,
 
41
    TestCaseInTempDir,
 
42
    TestSkipped,
 
43
    )
39
44
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths, 
40
45
                              resolve_conflicts, cook_conflicts, 
41
46
                              find_interesting, build_tree, get_backup_name,
385
390
        replace.apply()
386
391
 
387
392
    def test_symlinks(self):
388
 
        if not has_symlinks():
389
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
393
        self.requireFeature(SymlinkFeature)
390
394
        transform,root = self.get_transform()
391
395
        oz_id = transform.new_directory('oz', root, 'oz-id')
392
396
        wizard = transform.new_symlink('wizard', oz_id, 'wizard-target', 
1055
1059
        this.wt.revert()
1056
1060
 
1057
1061
    def test_file_merge(self):
1058
 
        if not has_symlinks():
1059
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
1062
        self.requireFeature(SymlinkFeature)
1060
1063
        root_id = generate_ids.gen_root_id()
1061
1064
        base = TransformGroup("BASE", root_id)
1062
1065
        this = TransformGroup("THIS", root_id)
1165
1168
class TestBuildTree(tests.TestCaseWithTransport):
1166
1169
 
1167
1170
    def test_build_tree(self):
1168
 
        if not has_symlinks():
1169
 
            raise TestSkipped('Test requires symlink support')
 
1171
        self.requireFeature(SymlinkFeature)
1170
1172
        os.mkdir('a')
1171
1173
        a = BzrDir.create_standalone_workingtree('a')
1172
1174
        os.mkdir('a/foo')
1220
1222
 
1221
1223
    def test_symlink_conflict_handling(self):
1222
1224
        """Ensure that when building trees, conflict handling is done"""
1223
 
        if not has_symlinks():
1224
 
            raise TestSkipped('Test requires symlink support')
 
1225
        self.requireFeature(SymlinkFeature)
1225
1226
        source = self.make_branch_and_tree('source')
1226
1227
        os.symlink('foo', 'source/symlink')
1227
1228
        source.add('symlink', 'new-symlink')