← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-03-13 17:25:29 UTC
  • mfrom: (6499 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6501.
  • Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
37
37
    )
38
38
from bzrlib.revisiontree import RevisionTree
39
39
from bzrlib.transform import TransformPreview
 
40
from bzrlib.tests import (
 
41
    features,
 
42
    )
40
43
from bzrlib.workingtree import (
41
44
    format_registry,
42
45
    )
242
245
        note that the order of the paths and fileids is deliberately
243
246
        mismatched to ensure that the result order is path based.
244
247
        """
245
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
248
        self.requireFeature(features.UnicodeFilenameFeature)
246
249
        tree = self.make_branch_and_tree('.')
247
250
        paths = ['0file',
248
251
            '1top-dir/',
274
277
 
275
278
    def _create_tree_with_utf8(self, tree):
276
279
        """Generate a tree with a utf8 revision and unicode paths."""
277
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
280
        self.requireFeature(features.UnicodeFilenameFeature)
278
281
        # We avoid combining characters in file names here, normalization
279
282
        # checks (as performed by some file systems (OSX) are outside the scope
280
283
        # of these tests).  We use the euro sign \N{Euro Sign} or \u20ac in
379
382
        'get_file_with_stat',
380
383
        'get_root_id',
381
384
        'get_symlink_target',
 
385
        'ids',
382
386
        'inv',
383
387
        'iter_search_rules',
384
388
        'is_executable',