~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_help.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
19
19
"""
20
20
 
21
21
 
22
 
import bzrlib
23
 
from bzrlib import config
24
 
from bzrlib.tests import TestCaseWithTransport
25
 
 
26
 
 
27
 
class TestHelp(TestCaseWithTransport):
 
22
from bzrlib import (
 
23
    config,
 
24
    i18n,
 
25
    tests,
 
26
    )
 
27
 
 
28
from bzrlib.tests.test_i18n import ZzzTranslations
 
29
 
 
30
 
 
31
class TestHelp(tests.TestCaseWithTransport):
28
32
 
29
33
    def test_help_basic(self):
30
34
        for cmd in ['--help', 'help', '-h', '-?']:
99
103
        long_help  = self.run_bzr('help --long')[0]
100
104
        qmark_long = self.run_bzr('? --long')[0]
101
105
        qmark_cmds = self.run_bzr('? commands')[0]
102
 
        self.assertEquals(dash_help, commands)
103
 
        self.assertEquals(dash_help, long_help)
104
 
        self.assertEquals(dash_help, qmark_long)
105
 
        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)
106
110
 
107
111
    def test_help_width_zero(self):
108
112
        self.overrideEnv('BZR_COLUMNS', '0')
134
138
    def test_help_detail(self):
135
139
        dash_h  = self.run_bzr('diff -h')[0]
136
140
        help_x  = self.run_bzr('help diff')[0]
137
 
        self.assertEquals(dash_h, help_x)
 
141
        self.assertEqual(dash_h, help_x)
138
142
        self.assertContainsRe(help_x, "Purpose:")
139
143
        self.assertContainsRe(help_x, "Usage:")
140
144
        self.assertContainsRe(help_x, "Options:")
156
160
    def test_help_help(self):
157
161
        help = self.run_bzr('help help')[0]
158
162
        qmark = self.run_bzr('? ?')[0]
159
 
        self.assertEquals(help, qmark)
 
163
        self.assertEqual(help, qmark)
160
164
        for line in help.split('\n'):
161
165
            if '--long' in line:
162
166
                self.assertContainsRe(line,
175
179
 
176
180
        self.assertEqual("'bzr c' is an alias for 'bzr cat'.\n",
177
181
                         self.run_bzr('help c')[0])
 
182
 
 
183
 
 
184
class TestTranslatedHelp(tests.TestCaseWithTransport):
 
185
    """Tests for display of translated help topics"""
 
186
 
 
187
    def setUp(self):
 
188
        super(TestTranslatedHelp, self).setUp()
 
189
        self.overrideAttr(i18n, '_translations', ZzzTranslations())
 
190
 
 
191
    def test_help_command_utf8(self):
 
192
        out, err = self.run_bzr(["help", "push"], encoding="utf-8")
 
193
        self.assertContainsRe(out, "zz\xc3\xa5{{:See also:")
 
194
 
 
195
    def test_help_switch_utf8(self):
 
196
        out, err = self.run_bzr(["push", "--help"], encoding="utf-8")
 
197
        self.assertContainsRe(out, "zz\xc3\xa5{{:See also:")
 
198
 
 
199
    def test_help_command_ascii(self):
 
200
        out, err = self.run_bzr(["help", "push"], encoding="ascii")
 
201
        self.assertContainsRe(out, "zz\\?{{:See also:")
 
202
 
 
203
    def test_help_switch_ascii(self):
 
204
        out, err = self.run_bzr(["push", "--help"], encoding="ascii")
 
205
        self.assertContainsRe(out, "zz\\?{{:See also:")