/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf_ui.py
228
228
        shelver = ExpectShelver(tree, tree.basis_tree())
229
229
        self.addCleanup(shelver.finalize)
230
230
        shelver.expect('Shelve changing target of "baz" from "bar" to '
231
 
                       '"vax"?', 0)
 
231
                '"vax"?', 0)
232
232
        shelver.expect('Shelve 1 change(s)?', 0)
233
233
        shelver.run()
234
234
        self.assertEqual('bar', os.readlink('tree/baz'))
255
255
        self.assertFileEqual(LINES_ZY, 'tree/foo')
256
256
 
257
257
    def test_shelve_all(self):
258
 
        self.create_shelvable_tree()
 
258
        tree = self.create_shelvable_tree()
259
259
        shelver = ExpectShelver.from_args(sys.stdout, all=True,
260
 
                                          directory='tree')
 
260
            directory='tree')
261
261
        try:
262
262
            shelver.run()
263
263
        finally:
302
302
    def test_shelve_old_root_preserved(self):
303
303
        tree1 = self.make_branch_and_tree('tree1')
304
304
        tree1.commit('add root')
305
 
        tree1_root_id = tree1.path2id('')
 
305
        tree1_root_id = tree1.get_root_id()
306
306
        tree2 = self.make_branch_and_tree('tree2')
307
307
        rev2 = tree2.commit('add root')
308
 
        self.assertNotEqual(tree1_root_id, tree2.path2id(''))
 
308
        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
309
309
        tree1.merge_from_branch(tree2.branch,
310
310
                                from_revision=revision.NULL_REVISION)
311
311
        tree1.commit('merging in tree2')
312
 
        self.assertEqual(tree1_root_id, tree1.path2id(''))
 
312
        self.assertEqual(tree1_root_id, tree1.get_root_id())
313
313
        # This is essentially assertNotRaises(InconsistentDelta)
314
314
        # With testtools 0.9.9, it can be rewritten as:
315
315
        # with ExpectedException(AssertionError,
439
439
        tree.lock_tree_write()
440
440
        self.addCleanup(tree.unlock)
441
441
        shelver = ExpectShelver(tree, tree.basis_tree(),
442
 
                                reporter=shelf_ui.ApplyReporter())
 
442
                               reporter=shelf_ui.ApplyReporter())
443
443
        self.addCleanup(shelver.finalize)
444
444
        shelver.expect('Change "foo" from directory to a file?', 0)
445
445
        shelver.expect('Apply 1 change(s)?', 0)
505
505
    def test_unshelve_args_dry_run(self):
506
506
        tree = self.create_tree_with_shelf()
507
507
        unshelver = shelf_ui.Unshelver.from_args(directory='tree',
508
 
                                                 action='dry-run')
 
508
            action='dry-run')
509
509
        try:
510
510
            unshelver.run()
511
511
        finally:
543
543
            +y
544
544
 
545
545
            """)
546
 
        self.assertEqualDiff(expected.encode('utf-8'), diff[-len(expected):])
 
546
        self.assertEqualDiff(expected, diff[-len(expected):])
547
547
 
548
548
    def test_unshelve_args_delete_only(self):
549
549
        tree = self.make_branch_and_tree('tree')
550
550
        manager = tree.get_shelf_manager()
551
551
        shelf_file = manager.new_shelf()[1]
552
552
        try:
553
 
            shelf_file.write(b'garbage')
 
553
            shelf_file.write('garbage')
554
554
        finally:
555
555
            shelf_file.close()
556
556
        unshelver = shelf_ui.Unshelver.from_args(directory='tree',
566
566
        manager = tree.get_shelf_manager()
567
567
        shelf_file = manager.new_shelf()[1]
568
568
        try:
569
 
            shelf_file.write(b'garbage')
 
569
            shelf_file.write('garbage')
570
570
        finally:
571
571
            shelf_file.close()
572
572
        self.assertRaises(shelf.InvalidShelfId,
573
 
                          shelf_ui.Unshelver.from_args, directory='tree',
574
 
                          action='delete-only', shelf_id='foo')
575
 
 
576
 
 
577
 
class TestUnshelveScripts(TestUnshelver,
578
 
                          script.TestCaseWithTransportAndScript):
 
573
            shelf_ui.Unshelver.from_args, directory='tree',
 
574
            action='delete-only', shelf_id='foo')
 
575
 
 
576
 
 
577
class TestUnshelveScripts(TestUnshelver, 
 
578
                          script.TestCaseWithTransportAndScript): 
579
579
 
580
580
    def test_unshelve_messages_keep(self):
581
581
        self.create_tree_with_shelf()