← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/test_get_symlink_target.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_get_symlink_target.py
23
23
    tests,
24
24
    )
25
25
from bzrlib.tests import per_tree
 
26
from bzrlib.tests import (
 
27
    features,
 
28
    )
26
29
 
27
30
 
28
31
class TestGetSymlinkTarget(per_tree.TestCaseWithTree):
29
32
 
30
33
    def get_tree_with_symlinks(self):
31
 
        self.requireFeature(tests.SymlinkFeature)
 
34
        self.requireFeature(features.SymlinkFeature)
32
35
        tree = self.make_branch_and_tree('tree')
33
36
        os.symlink('foo', 'tree/link')
34
37
        os.symlink('../bar', 'tree/rel_link')
48
51
        self.assertEqual('foo', tree.get_symlink_target('link-id', 'link'))
49
52
 
50
53
    def test_get_unicode_symlink_target(self):
51
 
        self.requireFeature(tests.SymlinkFeature)
52
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
54
        self.requireFeature(features.SymlinkFeature)
 
55
        self.requireFeature(features.UnicodeFilenameFeature)
53
56
        tree = self.make_branch_and_tree('tree')
54
57
        target = u'targ\N{Euro Sign}t'
55
58
        os.symlink(target,  u'tree/\u03b2_link'.encode(osutils._fs_enc))