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