/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_smart_add.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-14 06:27:28 UTC
  • mto: (5582.12.2 weave-plugin)
  • mto: This revision was merged to the branch mainline in revision 5718.
  • Revision ID: jelmer@samba.org-20110114062728-y858tsehb6pz8mjd
Add requires_normalized_unicode_filenames

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_smart_add.py
29
29
    workingtree,
30
30
    )
31
31
from bzrlib.tests import (
32
 
    features,
33
32
    test_smart_add,
34
33
    per_workingtree,
35
34
    )
301
300
 
302
301
    def test_accessible_explicit(self):
303
302
        osutils.normalized_filename = osutils._accessible_normalized_filename
304
 
        from bzrlib.plugins.weave_fmt.workingtree import WorkingTreeFormat2
305
 
        if isinstance(self.workingtree_format, WorkingTreeFormat2):
 
303
        if self.workingtree_format.requires_normalized_unicode_filenames:
306
304
            self.expectFailure(
307
 
                'With WorkingTreeFormat2, smart_add requires'
308
 
                ' normalized unicode filenames',
 
305
                'Working tree format smart_add requires normalized unicode filenames',
309
306
                self.assertRaises, errors.NoSuchFile,
310
307
                self.wt.smart_add, [u'a\u030a'])
311
308
        else:
318
315
 
319
316
    def test_accessible_implicit(self):
320
317
        osutils.normalized_filename = osutils._accessible_normalized_filename
321
 
        from bzrlib.plugins.weave_fmt.workingtree import WorkingTreeFormat2
322
 
        if isinstance(self.workingtree_format, WorkingTreeFormat2):
 
318
        if self.workingtree_format.requires_normalized_unicode_filenames:
323
319
            self.expectFailure(
324
 
                'With WorkingTreeFormat2, smart_add requires'
325
 
                ' normalized unicode filenames',
 
320
                'Working tree format smart_add requires normalized unicode filenames',
326
321
                self.assertRaises, errors.NoSuchFile,
327
322
                self.wt.smart_add, [])
328
323
        else: