← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_aliases.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/blackbox/test_aliases.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010, 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
49
49
        tree.add('a')
50
50
        tree.commit(message='1')
51
51
 
52
 
        self.assertEquals(bzr('c a'), str1)
 
52
        self.assertEqual(bzr('c a'), str1)
53
53
 
54
54
        self.build_tree_contents([('a', str2)])
55
55
        tree.commit(message='2')
56
56
 
57
 
        self.assertEquals(bzr('c a'), str2)
58
 
        self.assertEquals(bzr('c1 a'), str1)
59
 
        self.assertEquals(bzr('c1 --revision 2 a'), str2)
 
57
        self.assertEqual(bzr('c a'), str2)
 
58
        self.assertEqual(bzr('c1 a'), str1)
 
59
        self.assertEqual(bzr('c1 --revision 2 a'), str2)
60
60
 
61
61
        # If --no-aliases isn't working, we will not get retcode=3
62
62
        bzr('--no-aliases c a', retcode=3)
63
63
 
64
64
        # If --no-aliases breaks all of bzr, we also get retcode=3
65
65
        # So we need to catch the output as well
66
 
        self.assertEquals(bzr_catch_error('--no-aliases c a',
 
66
        self.assertEqual(bzr_catch_error('--no-aliases c a',
67
67
                                          retcode=None),
68
68
                          'bzr: ERROR: unknown command "c"\n')
69
69