← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir_colo/test_supported.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_controldir_colo/test_supported.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 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
59
59
        made_control.create_repository()
60
60
        made_branch = made_control.create_branch("colo")
61
61
        self.assertIsInstance(made_branch, Branch)
62
 
        self.assertEquals("colo", made_branch.name)
 
62
        self.assertEqual("colo", made_branch.name)
63
63
        self.assertEqual(made_control, made_branch.bzrdir)
64
64
 
65
65
    def test_open_by_url(self):
83
83
        self.assertNotEqual(made_branch.user_url, other_branch.user_url)
84
84
        self.assertNotEqual(made_branch.control_url, other_branch.control_url)
85
85
        re_made_branch = Branch.open(made_branch.user_url)
86
 
        self.assertEquals(re_made_branch.name, "colo")
 
86
        self.assertEqual(re_made_branch.name, "colo")
87
87
        self.assertEqual(made_branch.control_url, re_made_branch.control_url)
88
88
        self.assertEqual(made_branch.user_url, re_made_branch.user_url)
89
89
 
105
105
            urlutils.join_segment_parameters(
106
106
                other_branch.bzrdir.user_url, {"branch": "target"}))
107
107
        to_branch = to_dir.open_branch(name="target")
108
 
        self.assertEquals(revid, to_branch.last_revision())
 
108
        self.assertEqual(revid, to_branch.last_revision())
109
109
 
110
110
    def test_unicode(self):
111
111
        self.requireFeature(UnicodeFilenameFeature)
125
125
        self.assertTrue(
126
126
            u"col\xe9" in [b.name for b in made_control.list_branches()])
127
127
        made_branch = Branch.open(made_branch.user_url)
128
 
        self.assertEquals(u"col\xe9", made_branch.name)
 
128
        self.assertEqual(u"col\xe9", made_branch.name)
129
129
        made_control.destroy_branch(u"col\xe9")
130
130
 
131
131
    def test_get_branches(self):
154
154
        except errors.IncompatibleFormat:
155
155
            raise tests.TestNotApplicable(
156
156
                'Control dir does not support creating branch references.')
157
 
        self.assertEquals(referenced.base,
 
157
        self.assertEqual(referenced.base,
158
158
            repo.bzrdir.get_branch_reference('foo'))