~bzr-pqm/bzr/bzr.dev

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