← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.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/test_commit_merge.py
19
19
import shutil
20
20
 
21
21
from bzrlib.tests import (
 
22
    SymlinkFeature,
22
23
    TestCaseWithTransport,
23
 
    TestSkipped,
24
24
    )
25
25
from bzrlib.branch import Branch
26
26
from bzrlib.errors import PointlessCommit, BzrError
102
102
        by.repository.check([by.last_revision()])
103
103
 
104
104
    def test_merge_with_symlink(self):
105
 
        if not osutils.has_symlinks():
106
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
105
        self.requireFeature(SymlinkFeature)
107
106
        tree_a = self.make_branch_and_tree('tree_a')
108
107
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
109
108
        tree_a.add('link')