← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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'])