← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.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/test_shelf.py
25
25
    transform,
26
26
    workingtree,
27
27
    )
 
28
from bzrlib.tests import (
 
29
    features,
 
30
    )
28
31
 
29
32
 
30
33
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
214
217
 
215
218
    def _test_shelve_symlink_creation(self, link_name, link_target,
216
219
                                      shelve_change=False):
217
 
        self.requireFeature(tests.SymlinkFeature)
 
220
        self.requireFeature(features.SymlinkFeature)
218
221
        tree = self.make_branch_and_tree('.')
219
222
        tree.lock_write()
220
223
        self.addCleanup(tree.unlock)
241
244
        self._test_shelve_symlink_creation('foo', 'bar')
242
245
 
243
246
    def test_shelve_unicode_symlink_creation(self):
244
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
247
        self.requireFeature(features.UnicodeFilenameFeature)
245
248
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
246
249
                                           u'b\N{Euro Sign}ar')
247
250
 
251
254
    def _test_shelve_symlink_target_change(self, link_name,
252
255
                                           old_target, new_target,
253
256
                                           shelve_change=False):
254
 
        self.requireFeature(tests.SymlinkFeature)
 
257
        self.requireFeature(features.SymlinkFeature)
255
258
        tree = self.make_branch_and_tree('.')
256
259
        tree.lock_write()
257
260
        self.addCleanup(tree.unlock)
282
285
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
283
286
 
284
287
    def test_shelve_unicode_symlink_target_change(self):
285
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
288
        self.requireFeature(features.UnicodeFilenameFeature)
286
289
        self._test_shelve_symlink_target_change(
287
290
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
288
291