← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_options.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/test_options.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-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
346
346
            cmd = commands.get_cmd_object(cmd_name)
347
347
            for opt_name, opt in sorted(cmd.options().items()):
348
348
                g.append((cmd_name, opt))
349
 
        self.assert_(g)
 
349
        self.assertTrue(g)
350
350
        return g
351
351
 
352
352
    def test_option_grammar(self):
388
388
    def test_short_name(self):
389
389
        registry = controldir.ControlDirFormatRegistry()
390
390
        opt = option.RegistryOption('format', help='', registry=registry)
391
 
        self.assertEquals(None, opt.short_name())
 
391
        self.assertEqual(None, opt.short_name())
392
392
        opt = option.RegistryOption('format', short_name='F', help='',
393
393
            registry=registry)
394
 
        self.assertEquals('F', opt.short_name())
 
394
        self.assertEqual('F', opt.short_name())
395
395
 
396
396
    def test_option_custom_help(self):
397
397
        the_opt = option.Option.OPTIONS['help']