← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
32
32
    workingtree_4,
33
33
    )
34
34
from bzrlib.transport import memory
35
 
from bzrlib.tests import test_osutils
 
35
from bzrlib.tests import (
 
36
    features,
 
37
    test_osutils,
 
38
    )
36
39
from bzrlib.tests.scenarios import load_tests_apply_scenarios
37
40
 
38
41
 
1209
1212
        # The most trivial addition of a symlink when there are no parents and
1210
1213
        # its in the root and all data about the file is supplied
1211
1214
        # bzr doesn't support fake symlinks on windows, yet.
1212
 
        self.requireFeature(tests.SymlinkFeature)
 
1215
        self.requireFeature(features.SymlinkFeature)
1213
1216
        os.symlink(target, link_name)
1214
1217
        stat = os.lstat(link_name)
1215
1218
        expected_entries = [
1240
1243
        self._test_add_symlink_to_root_no_parents_all_data('a link', 'target')
1241
1244
 
1242
1245
    def test_add_symlink_unicode_to_root_no_parents_all_data(self):
1243
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
1246
        self.requireFeature(features.UnicodeFilenameFeature)
1244
1247
        self._test_add_symlink_to_root_no_parents_all_data(
1245
1248
            u'\N{Euro Sign}link', u'targ\N{Euro Sign}et')
1246
1249