← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_help.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_help.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-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
103
103
        long_help  = self.run_bzr('help --long')[0]
104
104
        qmark_long = self.run_bzr('? --long')[0]
105
105
        qmark_cmds = self.run_bzr('? commands')[0]
106
 
        self.assertEquals(dash_help, commands)
107
 
        self.assertEquals(dash_help, long_help)
108
 
        self.assertEquals(dash_help, qmark_long)
109
 
        self.assertEquals(dash_help, qmark_cmds)
 
106
        self.assertEqual(dash_help, commands)
 
107
        self.assertEqual(dash_help, long_help)
 
108
        self.assertEqual(dash_help, qmark_long)
 
109
        self.assertEqual(dash_help, qmark_cmds)
110
110
 
111
111
    def test_help_width_zero(self):
112
112
        self.overrideEnv('BZR_COLUMNS', '0')
138
138
    def test_help_detail(self):
139
139
        dash_h  = self.run_bzr('diff -h')[0]
140
140
        help_x  = self.run_bzr('help diff')[0]
141
 
        self.assertEquals(dash_h, help_x)
 
141
        self.assertEqual(dash_h, help_x)
142
142
        self.assertContainsRe(help_x, "Purpose:")
143
143
        self.assertContainsRe(help_x, "Usage:")
144
144
        self.assertContainsRe(help_x, "Options:")
160
160
    def test_help_help(self):
161
161
        help = self.run_bzr('help help')[0]
162
162
        qmark = self.run_bzr('? ?')[0]
163
 
        self.assertEquals(help, qmark)
 
163
        self.assertEqual(help, qmark)
164
164
        for line in help.split('\n'):
165
165
            if '--long' in line:
166
166
                self.assertContainsRe(line,