← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.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/tests/per_branch/test_branch.py
1
 
# Copyright (C) 2005-2012 Canonical Ltd
 
1
# Copyright (C) 2005-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
324
324
        if repo.bzrdir._format.colocated_branches:
325
325
            raise tests.TestNotApplicable(
326
326
                "control dir does not support colocated branches")
327
 
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
 
327
        self.assertEqual(0, len(repo.bzrdir.list_branches()))
328
328
        if not self.bzrdir_format.colocated_branches:
329
329
            raise tests.TestNotApplicable("control dir format does not support "
330
330
                "colocated branches")
335
335
            # branch references are not default init'able and
336
336
            # not all bzrdirs support colocated branches.
337
337
            return
338
 
        self.assertEquals(1, len(repo.bzrdir.list_branches()))
 
338
        self.assertEqual(1, len(repo.bzrdir.list_branches()))
339
339
        self.branch_format.initialize(repo.bzrdir, name='branch2')
340
 
        self.assertEquals(2, len(repo.bzrdir.list_branches()))
 
340
        self.assertEqual(2, len(repo.bzrdir.list_branches()))
341
341
 
342
342
    def test_create_append_revisions_only(self):
343
343
        try:
352
352
                # branch references are not default init'able and
353
353
                # not all branches support append_revisions_only
354
354
                return
355
 
            self.assertEquals(True, branch.get_append_revisions_only())
 
355
            self.assertEqual(True, branch.get_append_revisions_only())
356
356
            repo.bzrdir.destroy_branch()
357
357
 
358
358
    def test_get_set_append_revisions_only(self):