← 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: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_get_symlink_target.py
19
19
import os
20
20
 
21
21
from bzrlib import (
22
 
    errors,
23
22
    osutils,
24
23
    tests,
25
24
    )
26
25
from bzrlib.tests import per_tree
 
26
from bzrlib.tests import (
 
27
    features,
 
28
    )
27
29
 
28
30
 
29
31
class TestGetSymlinkTarget(per_tree.TestCaseWithTree):
30
32
 
31
33
    def get_tree_with_symlinks(self):
32
 
        self.requireFeature(tests.SymlinkFeature)
 
34
        self.requireFeature(features.SymlinkFeature)
33
35
        tree = self.make_branch_and_tree('tree')
34
36
        os.symlink('foo', 'tree/link')
35
37
        os.symlink('../bar', 'tree/rel_link')
46
48
        self.assertEqual('foo', tree.get_symlink_target('link-id'))
47
49
        self.assertEqual('../bar', tree.get_symlink_target('rel-link-id'))
48
50
        self.assertEqual('/baz/bing', tree.get_symlink_target('abs-link-id'))
 
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))