← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_lock/test_lock.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_lock/test_lock.py
21
21
    osutils,
22
22
    )
23
23
 
24
 
from bzrlib.tests import (features, UnicodeFilenameFeature)
 
24
from bzrlib.tests import (
 
25
    features,
 
26
    )
25
27
from bzrlib.tests.per_lock import TestCaseWithLock
26
28
 
27
29
 
166
168
 
167
169
class TestLockUnicodePath(TestCaseWithLock):
168
170
 
169
 
    _test_needs_features = [UnicodeFilenameFeature]
 
171
    _test_needs_features = [features.UnicodeFilenameFeature]
170
172
 
171
173
    def test_read_lock(self):
172
174
        self.build_tree([u'\u1234'])