~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

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