~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_signatures.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:
1
 
# Copyright (C) 2005-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
104
104
        wt = self.make_branch_and_tree('.')
105
105
        wt.commit("base", allow_pointless=True, rev_id='A')
106
106
        strategy = gpg.LoopbackGPGStrategy(None)
107
 
        self.assertEquals(
 
107
        self.assertEqual(
108
108
            (gpg.SIGNATURE_NOT_SIGNED, None),
109
109
            wt.branch.repository.verify_revision_signature('A', strategy))
110
110
 
122
122
                         'A').as_short_text() +
123
123
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
124
124
                         repo.get_signature_text('A'))
125
 
        self.assertEquals(
 
125
        self.assertEqual(
126
126
            (gpg.SIGNATURE_VALID, None, ),
127
127
            repo.verify_revision_signature('A', strategy))
128
128
 
141
141
                         'A').as_short_text() +
142
142
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
143
143
                         repo.get_signature_text('A'))
144
 
        self.assertEquals(
 
144
        self.assertEqual(
145
145
            [('A', gpg.SIGNATURE_VALID, None),
146
146
             ('B', gpg.SIGNATURE_NOT_SIGNED, None)],
147
147
            list(repo.verify_revision_signatures(['A', 'B'], strategy)))