~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_revision.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) 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009, 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
37
37
                 rev_id='test@user-1')
38
38
        rev = b.repository.get_revision('test@user-1')
39
39
        self.assertTrue('flavor' in rev.properties)
40
 
        self.assertEquals(rev.properties['flavor'], 'choc-mint')
41
 
        self.assertEquals([('branch-nick', 'Nicholas'),
 
40
        self.assertEqual(rev.properties['flavor'], 'choc-mint')
 
41
        self.assertEqual([('branch-nick', 'Nicholas'),
42
42
                           ('condiment', 'orange\n  mint\n\tcandy'),
43
43
                           ('empty', ''),
44
44
                           ('flavor', 'choc-mint'),
76
76
                      'unicode':u'\xb5',
77
77
                      'multiline':'foo\nbar\n\n'
78
78
                      })
79
 
        self.assertEquals(tree1.branch.last_revision(), rev1)
 
79
        self.assertEqual(tree1.branch.last_revision(), rev1)
80
80
        rev_a = tree1.branch.repository.get_revision(
81
81
                            tree1.branch.last_revision())
82
82