← 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: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
302
302
        tree1_root_id = tree1.get_root_id()
303
303
        tree2 = self.make_branch_and_tree('tree2')
304
304
        rev2 = tree2.commit('add root')
305
 
        self.assertNotEquals(tree1_root_id, tree2.get_root_id())
 
305
        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
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,