← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_fetch.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_interbranch/test_fetch.py
1
 
# Copyright (C) 2011 Canonical Ltd
 
1
# Copyright (C) 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
36
36
        b2.fetch(b1)
37
37
 
38
38
        # fetch does not update the last revision
39
 
        self.assertEquals(NULL_REVISION, b2.last_revision())
 
39
        self.assertEqual(NULL_REVISION, b2.last_revision())
40
40
 
41
41
        rev = b2.repository.get_revision('revision-1')
42
42
        tree = b2.repository.revision_tree('revision-1')
58
58
        b2.fetch(b1, limit=1)
59
59
 
60
60
        # fetch does not update the last revision
61
 
        self.assertEquals(NULL_REVISION, b2.last_revision())
 
61
        self.assertEqual(NULL_REVISION, b2.last_revision())
62
62
 
63
 
        self.assertEquals(
 
63
        self.assertEqual(
64
64
            set(['revision-1']),
65
65
            b2.repository.has_revisions(
66
66
                ['revision-1', 'revision-2', 'revision-3']))
76
76
        b2 = self.make_to_branch('b2')
77
77
        b2.fetch(b1, limit=1)
78
78
 
79
 
        self.assertEquals(
 
79
        self.assertEqual(
80
80
            set(['revision-1']),
81
81
            b2.repository.has_revisions(
82
82
                ['revision-1', 'revision-2', 'revision-3']))
87
87
        b2.fetch(b1, limit=1)
88
88
 
89
89
        # fetch does not update the last revision
90
 
        self.assertEquals(NULL_REVISION, b2.last_revision())
 
90
        self.assertEqual(NULL_REVISION, b2.last_revision())
91
91
 
92
 
        self.assertEquals(
 
92
        self.assertEqual(
93
93
            set(['revision-1', 'revision-2']),
94
94
            b2.repository.has_revisions(
95
95
                ['revision-1', 'revision-2', 'revision-3']))