/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 bzrlib/tests/test_shelf_ui.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:06:32 UTC
  • mto: (6614.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180632-xgp7k7z5bda9ap1w
Fix assertEquals being deprecated by using assertEqual.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
306
306
        tree1.merge_from_branch(tree2.branch,
307
307
                                from_revision=revision.NULL_REVISION)
308
308
        tree1.commit('merging in tree2')
309
 
        self.assertEquals(tree1_root_id, tree1.get_root_id())
 
309
        self.assertEqual(tree1_root_id, tree1.get_root_id())
310
310
        # This is essentially assertNotRaises(InconsistentDelta)
311
311
        # With testtools 0.9.9, it can be rewritten as:
312
312
        # with ExpectedException(AssertionError,