← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
27
27
    tests,
28
28
)
29
29
from bzrlib.tests import script
 
30
from bzrlib.tests import (
 
31
    features,
 
32
    )
30
33
 
31
34
 
32
35
class ExpectShelver(shelf_ui.Shelver):
208
211
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
209
212
 
210
213
    def test_shelve_modify_target(self):
211
 
        self.requireFeature(tests.SymlinkFeature)
 
214
        self.requireFeature(features.SymlinkFeature)
212
215
        tree = self.create_shelvable_tree()
213
216
        os.symlink('bar', 'tree/baz')
214
217
        tree.add('baz', 'baz-id')
448
451
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
449
452
 
450
453
    def test_shelve_modify_target(self):
451
 
        self.requireFeature(tests.SymlinkFeature)
 
454
        self.requireFeature(features.SymlinkFeature)
452
455
        tree = self.create_shelvable_tree()
453
456
        os.symlink('bar', 'tree/baz')
454
457
        tree.add('baz', 'baz-id')