← 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: Jelmer Vernooij
  • Date: 2011-10-04 22:20:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6190.
  • Revision ID: jelmer@samba.org-20111004222049-d9glniyleu0pppzd
Add a load_plugin_translations method.

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')
302
305
        finally:
303
306
            tree.unlock()
304
307
 
305
 
    def test_shelve_old_root_deleted(self):
 
308
    def test_shelve_old_root_preserved(self):
306
309
        tree1 = self.make_branch_and_tree('tree1')
307
310
        tree1.commit('add root')
 
311
        tree1_root_id = tree1.get_root_id()
308
312
        tree2 = self.make_branch_and_tree('tree2')
309
313
        rev2 = tree2.commit('add root')
 
314
        self.assertNotEquals(tree1_root_id, tree2.get_root_id())
310
315
        tree1.merge_from_branch(tree2.branch,
311
316
                                from_revision=revision.NULL_REVISION)
312
 
        tree1.commit('Replaced root entry')
 
317
        tree1.commit('merging in tree2')
 
318
        self.assertEquals(tree1_root_id, tree1.get_root_id())
313
319
        # This is essentially assertNotRaises(InconsistentDelta)
314
 
        # With testtools 0.99, it can be rewritten as:
 
320
        # With testtools 0.9.9, it can be rewritten as:
315
321
        # with ExpectedException(AssertionError,
316
322
        #                        'InconsistentDelta not raised'):
317
323
        #     with ExpectedException(errors.InconsistentDelta, ''):
445
451
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
446
452
 
447
453
    def test_shelve_modify_target(self):
448
 
        self.requireFeature(tests.SymlinkFeature)
 
454
        self.requireFeature(features.SymlinkFeature)
449
455
        tree = self.create_shelvable_tree()
450
456
        os.symlink('bar', 'tree/baz')
451
457
        tree.add('baz', 'baz-id')