← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/test_bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/test_bzrdir.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2011, 2012, 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
311
311
        self.assertIsInstance(control._format, bzrdir.BzrDirMetaFormat1)
312
312
        b = control.open_branch()
313
313
        self.addCleanup(b.lock_read().unlock)
314
 
        self.assertEquals(b._revision_history(),
 
314
        self.assertEqual(b._revision_history(),
315
315
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
316
316
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
317
317
 
318
318
    def test_upgrade_simple(self):
319
319
        """Upgrade simple v0.0.4 format to latest format"""
320
 
        eq = self.assertEquals
 
320
        eq = self.assertEqual
321
321
        self.build_tree_contents(_upgrade1_template)
322
322
        upgrade.upgrade(u'.')
323
323
        control = controldir.ControlDir.open('.')
378
378
        bzr, but can happen in branches imported from baz and arch, or from
379
379
        other systems, where the importer knows about a revision but not
380
380
        its contents."""
381
 
        eq = self.assertEquals
 
381
        eq = self.assertEqual
382
382
        self.build_tree_contents(_ghost_template)
383
383
        upgrade.upgrade(u'.')
384
384
        b = branch.Branch.open(u'.')