/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
2155.2.3 by Marius Kruger
* commands.py
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):
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
98
        config_file = StringIO(config_text.encode('utf-8'))
5345.2.1 by Vincent Ladeuil
Fix a missed test in the previous refactoring.
99
        my_config = config.GlobalConfig(_content=config_file)
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
100
        return my_config
101
102
    def test_simple(self):
2155.2.3 by Marius Kruger
* commands.py
103
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
104
            "diff=diff -r -2..-1\n")
105
        self.assertEqual([u'diff', u'-r', u'-2..-1'],
106
            commands.get_alias("diff", config=my_config))
107
108
    def test_single_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
109
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
110
            "diff=diff -r -2..-1 --diff-options "
111
            "'--strip-trailing-cr -wp'\n")
112
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
113
                          u'--strip-trailing-cr -wp'],
114
                          commands.get_alias("diff", config=my_config))
115
116
    def test_double_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
117
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
118
            "diff=diff -r -2..-1 --diff-options "
119
            "\"--strip-trailing-cr -wp\"\n")
120
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
121
                          u'--strip-trailing-cr -wp'],
122
                          commands.get_alias("diff", config=my_config))
123
124
    def test_unicode(self):
2155.2.3 by Marius Kruger
* commands.py
125
        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.
126
            u'iam=whoami "Erik B\u00e5gfors <erik@bagfors.nu>"\n')
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
127
        self.assertEqual([u'whoami', u'Erik B\u00e5gfors <erik@bagfors.nu>'],
128
                          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
129
130
131
class TestSeeAlso(tests.TestCase):
132
    """Tests for the see also functional of Command."""
133
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
134
    @staticmethod
135
    def _get_command_with_see_also(see_also):
136
        class ACommand(commands.Command):
137
            __doc__ = """A sample command."""
138
            _see_also = see_also
139
        return ACommand()
140
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
141
    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
142
        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
143
        self.assertEqual([], command.get_see_also())
144
145
    def test__see_also(self):
146
        """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
147
        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
148
        self.assertEqual(['bar', 'foo'], command.get_see_also())
149
150
    def test_deduplication(self):
151
        """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
152
        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
153
        self.assertEqual(['foo'], command.get_see_also())
154
155
    def test_sorted(self):
156
        """_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
157
        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
158
        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.
159
160
    def test_additional_terms(self):
161
        """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
162
        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.
163
        self.assertEqual(['bar', 'foo', 'gam'],
164
            command.get_see_also(['gam', 'bar', 'gam']))
165
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
166
167
class TestRegisterLazy(tests.TestCase):
168
169
    def setUp(self):
4153.1.2 by Andrew Bennetts
Add missing TestCase.setUp upcalls.
170
        tests.TestCase.setUp(self)
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
171
        import bzrlib.tests.fake_command
172
        del sys.modules['bzrlib.tests.fake_command']
173
        global lazy_command_imported
174
        lazy_command_imported = False
4119.3.8 by Robert Collins
Get missing command support sorted out.
175
        commands.install_bzr_command_hooks()
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
176
177
    @staticmethod
178
    def remove_fake():
179
        commands.plugin_cmds.remove('fake')
180
181
    def assertIsFakeCommand(self, cmd_obj):
182
        from bzrlib.tests.fake_command import cmd_fake
183
        self.assertIsInstance(cmd_obj, cmd_fake)
184
185
    def test_register_lazy(self):
186
        """Ensure lazy registration works"""
187
        commands.plugin_cmds.register_lazy('cmd_fake', [],
188
                                           'bzrlib.tests.fake_command')
189
        self.addCleanup(self.remove_fake)
190
        self.assertFalse(lazy_command_imported)
191
        fake_instance = commands.get_cmd_object('fake')
192
        self.assertTrue(lazy_command_imported)
193
        self.assertIsFakeCommand(fake_instance)
194
195
    def test_get_unrelated_does_not_import(self):
196
        commands.plugin_cmds.register_lazy('cmd_fake', [],
197
                                           'bzrlib.tests.fake_command')
198
        self.addCleanup(self.remove_fake)
199
        commands.get_cmd_object('status')
200
        self.assertFalse(lazy_command_imported)
201
202
    def test_aliases(self):
203
        commands.plugin_cmds.register_lazy('cmd_fake', ['fake_alias'],
204
                                           'bzrlib.tests.fake_command')
205
        self.addCleanup(self.remove_fake)
206
        fake_instance = commands.get_cmd_object('fake_alias')
207
        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.
208
209
210
class TestExtendCommandHook(tests.TestCase):
211
212
    def test_fires_on_get_cmd_object(self):
213
        # The extend_command(cmd) hook fires when commands are delivered to the
214
        # ui, not simply at registration (because lazy registered plugin
215
        # commands are registered).
216
        # when they are simply created.
217
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
218
        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.
219
        commands.Command.hooks.install_named_hook(
220
            "extend_command", hook_calls.append, None)
221
        # 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
222
        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
223
            __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.
224
        self.assertEqual([], hook_calls)
225
        # -- as a builtin
226
        # register the command class, should not fire
227
        try:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
228
            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.
229
            self.assertEqual([], hook_calls)
230
            # and ask for the object, should fire
231
            cmd = commands.get_cmd_object('test-extend-command-hook')
232
            # For resilience - to ensure all code paths hit it - we
233
            # fire on everything returned in the 'cmd_dict', which is currently
234
            # all known commands, so assert that cmd is in hook_calls
235
            self.assertSubset([cmd], hook_calls)
236
            del hook_calls[:]
237
        finally:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
238
            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.
239
        # -- as a plugin lazy registration
240
        try:
241
            # register the command class, should not fire
242
            commands.plugin_cmds.register_lazy('cmd_fake', [],
243
                                               'bzrlib.tests.fake_command')
244
            self.assertEqual([], hook_calls)
245
            # and ask for the object, should fire
246
            cmd = commands.get_cmd_object('fake')
247
            self.assertEqual([cmd], hook_calls)
248
        finally:
249
            commands.plugin_cmds.remove('fake')
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
250
251
252
class TestGetCommandHook(tests.TestCase):
253
254
    def test_fires_on_get_cmd_object(self):
255
        # The get_command(cmd) hook fires when commands are delivered to the
256
        # ui.
4119.3.8 by Robert Collins
Get missing command support sorted out.
257
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
258
        hook_calls = []
259
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
260
            __doc__ = """A sample command."""
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
261
        def get_cmd(cmd_or_None, cmd_name):
262
            hook_calls.append(('called', cmd_or_None, cmd_name))
263
            if cmd_name in ('foo', 'info'):
264
                return ACommand()
265
        commands.Command.hooks.install_named_hook(
266
            "get_command", get_cmd, None)
267
        # create a command directly, should not fire
268
        cmd = ACommand()
269
        self.assertEqual([], hook_calls)
270
        # ask by name, should fire and give us our command
271
        cmd = commands.get_cmd_object('foo')
272
        self.assertEqual([('called', None, 'foo')], hook_calls)
273
        self.assertIsInstance(cmd, ACommand)
274
        del hook_calls[:]
275
        # ask by a name that is supplied by a builtin - the hook should still
276
        # fire and we still get our object, but we should see the builtin
277
        # passed to the hook.
278
        cmd = commands.get_cmd_object('info')
279
        self.assertIsInstance(cmd, ACommand)
280
        self.assertEqual(1, len(hook_calls))
281
        self.assertEqual('info', hook_calls[0][2])
282
        self.assertIsInstance(hook_calls[0][1], builtins.cmd_info)
283
284
4119.3.8 by Robert Collins
Get missing command support sorted out.
285
class TestGetMissingCommandHook(tests.TestCase):
286
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
287
    def hook_missing(self):
288
        """Hook get_missing_command for testing."""
289
        self.hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
290
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
291
            __doc__ = """A sample command."""
4119.3.8 by Robert Collins
Get missing command support sorted out.
292
        def get_missing_cmd(cmd_name):
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
293
            self.hook_calls.append(('called', cmd_name))
4119.3.8 by Robert Collins
Get missing command support sorted out.
294
            if cmd_name in ('foo', 'info'):
295
                return ACommand()
296
        commands.Command.hooks.install_named_hook(
297
            "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
298
        self.ACommand = ACommand
299
300
    def test_fires_on_get_cmd_object(self):
301
        # The get_missing_command(cmd) hook fires when commands are delivered to the
302
        # ui.
303
        self.hook_missing()
4119.3.8 by Robert Collins
Get missing command support sorted out.
304
        # 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
305
        self.cmd = self.ACommand()
306
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
307
        # ask by name, should fire and give us our command
308
        cmd = commands.get_cmd_object('foo')
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
309
        self.assertEqual([('called', 'foo')], self.hook_calls)
310
        self.assertIsInstance(cmd, self.ACommand)
311
        del self.hook_calls[:]
4119.3.8 by Robert Collins
Get missing command support sorted out.
312
        # ask by a name that is supplied by a builtin - the hook should not
313
        # fire and we still get our object.
314
        commands.install_bzr_command_hooks()
315
        cmd = commands.get_cmd_object('info')
316
        self.assertNotEqual(None, cmd)
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
317
        self.assertEqual(0, len(self.hook_calls))
318
319
    def test_skipped_on_HelpCommandIndex_get_topics(self):
320
        # The get_missing_command(cmd_name) hook is not fired when
321
        # looking up help topics.
322
        self.hook_missing()
323
        topic = commands.HelpCommandIndex()
324
        topics = topic.get_topics('foo')
325
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
326
327
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
328
class TestListCommandHook(tests.TestCase):
329
330
    def test_fires_on_all_command_names(self):
331
        # The list_commands() hook fires when all_command_names() is invoked.
332
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
333
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
334
        def list_my_commands(cmd_names):
335
            hook_calls.append('called')
336
            cmd_names.update(['foo', 'bar'])
337
            return cmd_names
338
        commands.Command.hooks.install_named_hook(
339
            "list_commands", list_my_commands, None)
340
        # Get a command, which should not trigger the hook.
341
        cmd = commands.get_cmd_object('info')
342
        self.assertEqual([], hook_calls)
343
        # Get all command classes (for docs and shell completion).
344
        cmds = list(commands.all_command_names())
345
        self.assertEqual(['called'], hook_calls)
346
        self.assertSubset(['foo', 'bar'], cmds)
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
347
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')