~bzr-pqm/bzr/bzr.dev

5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.12.59 by Aaron Bentley
Added command-quieting test
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.12.59 by Aaron Bentley
Added command-quieting test
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.12.59 by Aaron Bentley
Added command-quieting test
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.12.59 by Aaron Bentley
Added command-quieting test
16
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
17
import errno
5264.1.2 by Robert Collins
Final fix for 'no help for command' issue. We now show a clean message
18
import inspect
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
19
import sys
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
20
21
from bzrlib import (
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
22
    builtins,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
23
    commands,
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
24
    config,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
25
    errors,
4251.1.1 by Aaron Bentley
Support hidden options.
26
    option,
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
27
    symbol_versioning,
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
28
    tests,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
29
    )
30
from bzrlib.commands import display_command
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
31
from bzrlib.tests import TestSkipped
32
33
34
class TestCommands(tests.TestCase):
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
35
5264.1.2 by Robert Collins
Final fix for 'no help for command' issue. We now show a clean message
36
    def test_all_commands_have_help(self):
37
        commands._register_builtin_commands()
38
        commands_without_help = set()
39
        base_doc = inspect.getdoc(commands.Command)
40
        for cmd_name in commands.all_command_names():
41
            cmd = commands.get_cmd_object(cmd_name)
42
            cmd_help = cmd.help()
43
            if not cmd_help or cmd_help == base_doc:
44
                commands_without_help.append(cmd_name)
45
        self.assertLength(0, commands_without_help)
46
1185.12.59 by Aaron Bentley
Added command-quieting test
47
    def test_display_command(self):
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
48
        """EPIPE message is selectively suppressed"""
1185.12.59 by Aaron Bentley
Added command-quieting test
49
        def pipe_thrower():
50
            raise IOError(errno.EPIPE, "Bogus pipe error")
51
        self.assertRaises(IOError, pipe_thrower)
52
        @display_command
53
        def non_thrower():
54
            pipe_thrower()
55
        non_thrower()
56
        @display_command
57
        def other_thrower():
58
            raise IOError(errno.ESPIPE, "Bogus pipe error")
59
        self.assertRaises(IOError, other_thrower)
60
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
61
    def test_unicode_command(self):
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
62
        # This error is thrown when we can't find the command in the
63
        # list of available commands
64
        self.assertRaises(errors.BzrCommandError,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
65
                          commands.run_bzr, [u'cmd\xb5'])
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
66
67
    def test_unicode_option(self):
68
        # This error is actually thrown by optparse, when it
69
        # can't find the given option
1913.2.4 by Martin Pool
python2.5 apparently has trouble with unicode options
70
        import optparse
71
        if optparse.__version__ == "1.5.3":
72
            raise TestSkipped("optparse 1.5.3 can't handle unicode options")
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
73
        self.assertRaises(errors.BzrCommandError,
74
                          commands.run_bzr, ['log', u'--option\xb5'])
75
4251.1.1 by Aaron Bentley
Support hidden options.
76
    @staticmethod
77
    def get_command(options):
4251.1.7 by Aaron Bentley
Use generated subclass instead of patching Command instance
78
        class cmd_foo(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
79
            __doc__ = 'Bar'
4251.1.7 by Aaron Bentley
Use generated subclass instead of patching Command instance
80
81
            takes_options = options
82
83
        return cmd_foo()
4251.1.1 by Aaron Bentley
Support hidden options.
84
85
    def test_help_hidden(self):
86
        c = self.get_command([option.Option('foo', hidden=True)])
87
        self.assertNotContainsRe(c.get_help_text(), '--foo')
88
89
    def test_help_not_hidden(self):
90
        c = self.get_command([option.Option('foo', hidden=False)])
91
        self.assertContainsRe(c.get_help_text(), '--foo')
92
5255.5.1 by Ian Clatworthy
Ensure builtin_command_names() is initialized correctly
93
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
94
class TestGetAlias(tests.TestCase):
2155.2.3 by Marius Kruger
* commands.py
95
96
    def _get_config(self, config_text):
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
97
        my_config = config.GlobalConfig.from_string(config_text)
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
98
        return my_config
99
100
    def test_simple(self):
2155.2.3 by Marius Kruger
* commands.py
101
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
102
            "diff=diff -r -2..-1\n")
103
        self.assertEqual([u'diff', u'-r', u'-2..-1'],
104
            commands.get_alias("diff", config=my_config))
105
106
    def test_single_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
107
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
108
            "diff=diff -r -2..-1 --diff-options "
109
            "'--strip-trailing-cr -wp'\n")
110
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
111
                          u'--strip-trailing-cr -wp'],
112
                          commands.get_alias("diff", config=my_config))
113
114
    def test_double_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
115
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
116
            "diff=diff -r -2..-1 --diff-options "
117
            "\"--strip-trailing-cr -wp\"\n")
118
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
119
                          u'--strip-trailing-cr -wp'],
120
                          commands.get_alias("diff", config=my_config))
121
122
    def test_unicode(self):
2155.2.3 by Marius Kruger
* commands.py
123
        my_config = self._get_config("[ALIASES]\n"
4913.5.4 by Gordon Tyler
Changed test_single_quotes to skip on win32 and fixed test_unicode to not fail on win32.
124
            u'iam=whoami "Erik B\u00e5gfors <erik@bagfors.nu>"\n')
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
125
        self.assertEqual([u'whoami', u'Erik B\u00e5gfors <erik@bagfors.nu>'],
126
                          commands.get_alias("iam", config=my_config))
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
127
128
129
class TestSeeAlso(tests.TestCase):
130
    """Tests for the see also functional of Command."""
131
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
132
    @staticmethod
133
    def _get_command_with_see_also(see_also):
134
        class ACommand(commands.Command):
135
            __doc__ = """A sample command."""
136
            _see_also = see_also
137
        return ACommand()
138
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
139
    def test_default_subclass_no_see_also(self):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
140
        command = self._get_command_with_see_also([])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
141
        self.assertEqual([], command.get_see_also())
142
143
    def test__see_also(self):
144
        """When _see_also is defined, it sets the result of get_see_also()."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
145
        command = self._get_command_with_see_also(['bar', 'foo'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
146
        self.assertEqual(['bar', 'foo'], command.get_see_also())
147
148
    def test_deduplication(self):
149
        """Duplicates in _see_also are stripped out."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
150
        command = self._get_command_with_see_also(['foo', 'foo'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
151
        self.assertEqual(['foo'], command.get_see_also())
152
153
    def test_sorted(self):
154
        """_see_also is sorted by get_see_also."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
155
        command = self._get_command_with_see_also(['foo', 'bar'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
156
        self.assertEqual(['bar', 'foo'], command.get_see_also())
2432.1.21 by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied.
157
158
    def test_additional_terms(self):
159
        """Additional terms can be supplied and are deduped and sorted."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
160
        command = self._get_command_with_see_also(['foo', 'bar'])
2432.1.21 by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied.
161
        self.assertEqual(['bar', 'foo', 'gam'],
162
            command.get_see_also(['gam', 'bar', 'gam']))
163
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
164
165
class TestRegisterLazy(tests.TestCase):
166
167
    def setUp(self):
4153.1.2 by Andrew Bennetts
Add missing TestCase.setUp upcalls.
168
        tests.TestCase.setUp(self)
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
169
        import bzrlib.tests.fake_command
170
        del sys.modules['bzrlib.tests.fake_command']
171
        global lazy_command_imported
172
        lazy_command_imported = False
4119.3.8 by Robert Collins
Get missing command support sorted out.
173
        commands.install_bzr_command_hooks()
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
174
175
    @staticmethod
176
    def remove_fake():
177
        commands.plugin_cmds.remove('fake')
178
179
    def assertIsFakeCommand(self, cmd_obj):
180
        from bzrlib.tests.fake_command import cmd_fake
181
        self.assertIsInstance(cmd_obj, cmd_fake)
182
183
    def test_register_lazy(self):
184
        """Ensure lazy registration works"""
185
        commands.plugin_cmds.register_lazy('cmd_fake', [],
186
                                           'bzrlib.tests.fake_command')
187
        self.addCleanup(self.remove_fake)
188
        self.assertFalse(lazy_command_imported)
189
        fake_instance = commands.get_cmd_object('fake')
190
        self.assertTrue(lazy_command_imported)
191
        self.assertIsFakeCommand(fake_instance)
192
193
    def test_get_unrelated_does_not_import(self):
194
        commands.plugin_cmds.register_lazy('cmd_fake', [],
195
                                           'bzrlib.tests.fake_command')
196
        self.addCleanup(self.remove_fake)
197
        commands.get_cmd_object('status')
198
        self.assertFalse(lazy_command_imported)
199
200
    def test_aliases(self):
201
        commands.plugin_cmds.register_lazy('cmd_fake', ['fake_alias'],
202
                                           'bzrlib.tests.fake_command')
203
        self.addCleanup(self.remove_fake)
204
        fake_instance = commands.get_cmd_object('fake_alias')
205
        self.assertIsFakeCommand(fake_instance)
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
206
207
208
class TestExtendCommandHook(tests.TestCase):
209
210
    def test_fires_on_get_cmd_object(self):
211
        # The extend_command(cmd) hook fires when commands are delivered to the
212
        # ui, not simply at registration (because lazy registered plugin
213
        # commands are registered).
214
        # when they are simply created.
215
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
216
        commands.install_bzr_command_hooks()
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
217
        commands.Command.hooks.install_named_hook(
218
            "extend_command", hook_calls.append, None)
219
        # create a command, should not fire
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
220
        class cmd_test_extend_command_hook(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
221
            __doc__ = """A sample command."""
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
222
        self.assertEqual([], hook_calls)
223
        # -- as a builtin
224
        # register the command class, should not fire
225
        try:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
226
            commands.builtin_command_registry.register(cmd_test_extend_command_hook)
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
227
            self.assertEqual([], hook_calls)
228
            # and ask for the object, should fire
229
            cmd = commands.get_cmd_object('test-extend-command-hook')
230
            # For resilience - to ensure all code paths hit it - we
231
            # fire on everything returned in the 'cmd_dict', which is currently
232
            # all known commands, so assert that cmd is in hook_calls
233
            self.assertSubset([cmd], hook_calls)
234
            del hook_calls[:]
235
        finally:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
236
            commands.builtin_command_registry.remove('test-extend-command-hook')
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
237
        # -- as a plugin lazy registration
238
        try:
239
            # register the command class, should not fire
240
            commands.plugin_cmds.register_lazy('cmd_fake', [],
241
                                               'bzrlib.tests.fake_command')
242
            self.assertEqual([], hook_calls)
243
            # and ask for the object, should fire
244
            cmd = commands.get_cmd_object('fake')
245
            self.assertEqual([cmd], hook_calls)
246
        finally:
247
            commands.plugin_cmds.remove('fake')
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
248
249
250
class TestGetCommandHook(tests.TestCase):
251
252
    def test_fires_on_get_cmd_object(self):
253
        # The get_command(cmd) hook fires when commands are delivered to the
254
        # ui.
4119.3.8 by Robert Collins
Get missing command support sorted out.
255
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
256
        hook_calls = []
257
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
258
            __doc__ = """A sample command."""
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
259
        def get_cmd(cmd_or_None, cmd_name):
260
            hook_calls.append(('called', cmd_or_None, cmd_name))
261
            if cmd_name in ('foo', 'info'):
262
                return ACommand()
263
        commands.Command.hooks.install_named_hook(
264
            "get_command", get_cmd, None)
265
        # create a command directly, should not fire
266
        cmd = ACommand()
267
        self.assertEqual([], hook_calls)
268
        # ask by name, should fire and give us our command
269
        cmd = commands.get_cmd_object('foo')
270
        self.assertEqual([('called', None, 'foo')], hook_calls)
271
        self.assertIsInstance(cmd, ACommand)
272
        del hook_calls[:]
273
        # ask by a name that is supplied by a builtin - the hook should still
274
        # fire and we still get our object, but we should see the builtin
275
        # passed to the hook.
276
        cmd = commands.get_cmd_object('info')
277
        self.assertIsInstance(cmd, ACommand)
278
        self.assertEqual(1, len(hook_calls))
279
        self.assertEqual('info', hook_calls[0][2])
280
        self.assertIsInstance(hook_calls[0][1], builtins.cmd_info)
281
282
4119.3.8 by Robert Collins
Get missing command support sorted out.
283
class TestGetMissingCommandHook(tests.TestCase):
284
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
285
    def hook_missing(self):
286
        """Hook get_missing_command for testing."""
287
        self.hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
288
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
289
            __doc__ = """A sample command."""
4119.3.8 by Robert Collins
Get missing command support sorted out.
290
        def get_missing_cmd(cmd_name):
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
291
            self.hook_calls.append(('called', cmd_name))
4119.3.8 by Robert Collins
Get missing command support sorted out.
292
            if cmd_name in ('foo', 'info'):
293
                return ACommand()
294
        commands.Command.hooks.install_named_hook(
295
            "get_missing_command", get_missing_cmd, None)
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
296
        self.ACommand = ACommand
297
298
    def test_fires_on_get_cmd_object(self):
299
        # The get_missing_command(cmd) hook fires when commands are delivered to the
300
        # ui.
301
        self.hook_missing()
4119.3.8 by Robert Collins
Get missing command support sorted out.
302
        # create a command directly, should not fire
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
303
        self.cmd = self.ACommand()
304
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
305
        # ask by name, should fire and give us our command
306
        cmd = commands.get_cmd_object('foo')
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
307
        self.assertEqual([('called', 'foo')], self.hook_calls)
308
        self.assertIsInstance(cmd, self.ACommand)
309
        del self.hook_calls[:]
4119.3.8 by Robert Collins
Get missing command support sorted out.
310
        # ask by a name that is supplied by a builtin - the hook should not
311
        # fire and we still get our object.
312
        commands.install_bzr_command_hooks()
313
        cmd = commands.get_cmd_object('info')
314
        self.assertNotEqual(None, cmd)
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
315
        self.assertEqual(0, len(self.hook_calls))
316
317
    def test_skipped_on_HelpCommandIndex_get_topics(self):
318
        # The get_missing_command(cmd_name) hook is not fired when
319
        # looking up help topics.
320
        self.hook_missing()
321
        topic = commands.HelpCommandIndex()
322
        topics = topic.get_topics('foo')
323
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
324
325
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
326
class TestListCommandHook(tests.TestCase):
327
328
    def test_fires_on_all_command_names(self):
329
        # The list_commands() hook fires when all_command_names() is invoked.
330
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
331
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
332
        def list_my_commands(cmd_names):
333
            hook_calls.append('called')
334
            cmd_names.update(['foo', 'bar'])
335
            return cmd_names
336
        commands.Command.hooks.install_named_hook(
337
            "list_commands", list_my_commands, None)
338
        # Get a command, which should not trigger the hook.
339
        cmd = commands.get_cmd_object('info')
340
        self.assertEqual([], hook_calls)
341
        # Get all command classes (for docs and shell completion).
342
        cmds = list(commands.all_command_names())
343
        self.assertEqual(['called'], hook_calls)
344
        self.assertSubset(['foo', 'bar'], cmds)
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
345
5255.5.1 by Ian Clatworthy
Ensure builtin_command_names() is initialized correctly
346
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
347
class TestDeprecations(tests.TestCase):
348
349
    def test_shlex_split_unicode_deprecation(self):
350
        res = self.applyDeprecated(
351
                symbol_versioning.deprecated_in((2, 2, 0)),
352
                commands.shlex_split_unicode, 'whatever')