/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
2
#
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.
7
#
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.
12
#
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
16
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
17
import re
18
2221.4.1 by Aaron Bentley
Get registry options working
19
from bzrlib import (
20
    builtins,
21
    bzrdir,
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
22
    commands,
2221.4.1 by Aaron Bentley
Get registry options working
23
    errors,
24
    option,
25
    repository,
2221.4.8 by Aaron Bentley
Merge bzr.dev
26
    symbol_versioning,
2221.4.1 by Aaron Bentley
Get registry options working
27
    )
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
28
from bzrlib.builtins import cmd_commit, cmd_log, cmd_status
29
from bzrlib.commands import Command, parse_args
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
30
from bzrlib.tests import TestCase
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
31
from bzrlib.repofmt import knitrepo
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
32
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
33
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
34
def parse(options, args):
35
    parser = option.get_optparser(dict((o.name, o) for o in options))
36
    return parser.parse_args(args)
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
37
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
38
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
39
class OptionTests(TestCase):
40
    """Command-line option tests"""
41
42
    def test_parse_args(self):
43
        """Option parser"""
44
        eq = self.assertEquals
45
        eq(parse_args(cmd_commit(), ['--help']),
2376.4.10 by Jonathan Lange
Oops. Update tests to account for changed options to commit.
46
           ([], {'fixes': [], 'help': True}))
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
47
        eq(parse_args(cmd_commit(), ['--message=biter']),
2376.4.10 by Jonathan Lange
Oops. Update tests to account for changed options to commit.
48
           ([], {'fixes': [], 'message': 'biter'}))
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
49
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
50
    def test_no_more_opts(self):
51
        """Terminated options"""
52
        self.assertEquals(parse_args(cmd_commit(), ['--', '-file-with-dashes']),
2376.4.10 by Jonathan Lange
Oops. Update tests to account for changed options to commit.
53
                          (['-file-with-dashes'], {'fixes': []}))
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
54
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
55
    def test_option_help(self):
56
        """Options have help strings."""
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
57
        out, err = self.run_bzr('commit --help')
2598.1.4 by Martin Pool
Fix up tests for option help cleanups
58
        self.assertContainsRe(out,
59
                r'--file(.|\n)*Take commit message from this file\.')
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
60
        self.assertContainsRe(out, r'-h.*--help')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
61
62
    def test_option_help_global(self):
63
        """Global options have help strings."""
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
64
        out, err = self.run_bzr('help status')
2598.1.4 by Martin Pool
Fix up tests for option help cleanups
65
        self.assertContainsRe(out, r'--show-ids.*Show internal object.')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
66
67
    def test_option_arg_help(self):
68
        """Help message shows option arguments."""
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
69
        out, err = self.run_bzr('help commit')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
70
        self.assertEquals(err, '')
71
        self.assertContainsRe(out, r'--file[ =]MSGFILE')
72
1185.35.24 by Aaron Bentley
Fixed handling of short options not accepted by the command
73
    def test_unknown_short_opt(self):
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
74
        out, err = self.run_bzr('help -r', retcode=3)
1857.1.1 by Aaron Bentley
Use optparse for parsing options
75
        self.assertContainsRe(err, r'no such option')
1185.35.24 by Aaron Bentley
Fixed handling of short options not accepted by the command
76
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
77
    def test_set_short_name(self):
78
        o = option.Option('wiggle')
79
        o.set_short_name('w')
80
        self.assertEqual(o.short_name(), 'w')
81
1852.1.1 by John Arbash Meinel
Allow a plain '-' to be supplied as an argument. bug #50984
82
    def test_allow_dash(self):
83
        """Test that we can pass a plain '-' as an argument."""
2376.4.10 by Jonathan Lange
Oops. Update tests to account for changed options to commit.
84
        self.assertEqual(
85
            (['-'], {'fixes': []}), parse_args(cmd_commit(), ['-']))
1852.1.1 by John Arbash Meinel
Allow a plain '-' to be supplied as an argument. bug #50984
86
2221.4.1 by Aaron Bentley
Get registry options working
87
    def parse(self, options, args):
88
        parser = option.get_optparser(dict((o.name, o) for o in options))
89
        return parser.parse_args(args)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
90
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
91
    def test_conversion(self):
92
        options = [option.Option('hello')]
2221.4.1 by Aaron Bentley
Get registry options working
93
        opts, args = self.parse(options, ['--no-hello', '--hello'])
1857.1.16 by Aaron Bentley
Add tests for iter_switches
94
        self.assertEqual(True, opts.hello)
2221.4.1 by Aaron Bentley
Get registry options working
95
        opts, args = self.parse(options, [])
1857.1.16 by Aaron Bentley
Add tests for iter_switches
96
        self.assertEqual(option.OptionParser.DEFAULT_VALUE, opts.hello)
2221.4.1 by Aaron Bentley
Get registry options working
97
        opts, args = self.parse(options, ['--hello', '--no-hello'])
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
98
        self.assertEqual(False, opts.hello)
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
99
        options = [option.Option('number', type=int)]
2221.4.1 by Aaron Bentley
Get registry options working
100
        opts, args = self.parse(options, ['--number', '6'])
1857.1.16 by Aaron Bentley
Add tests for iter_switches
101
        self.assertEqual(6, opts.number)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
102
        self.assertRaises(errors.BzrCommandError, self.parse, options,
2221.4.1 by Aaron Bentley
Get registry options working
103
                          ['--number'])
2221.4.9 by Aaron Bentley
Zap trailing whitespace
104
        self.assertRaises(errors.BzrCommandError, self.parse, options,
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
105
                          ['--no-number'])
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
106
2221.4.1 by Aaron Bentley
Get registry options working
107
    def test_registry_conversion(self):
108
        registry = bzrdir.BzrDirFormatRegistry()
109
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
110
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help')
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
111
        registry.register_metadir('hidden', 'RepositoryFormatKnit1',
112
            'two help', hidden=True)
2221.4.1 by Aaron Bentley
Get registry options working
113
        registry.set_default('one')
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
114
        options = [option.RegistryOption('format', '', registry, str)]
2221.4.1 by Aaron Bentley
Get registry options working
115
        opts, args = self.parse(options, ['--format', 'one'])
116
        self.assertEqual({'format':'one'}, opts)
117
        opts, args = self.parse(options, ['--format', 'two'])
118
        self.assertEqual({'format':'two'}, opts)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
119
        self.assertRaises(errors.BadOptionValue, self.parse, options,
2221.4.1 by Aaron Bentley
Get registry options working
120
                          ['--format', 'three'])
2221.4.9 by Aaron Bentley
Zap trailing whitespace
121
        self.assertRaises(errors.BzrCommandError, self.parse, options,
2221.4.1 by Aaron Bentley
Get registry options working
122
                          ['--two'])
2221.4.9 by Aaron Bentley
Zap trailing whitespace
123
        options = [option.RegistryOption('format', '', registry, str,
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
124
                   value_switches=True)]
2221.4.1 by Aaron Bentley
Get registry options working
125
        opts, args = self.parse(options, ['--two'])
126
        self.assertEqual({'format':'two'}, opts)
127
        opts, args = self.parse(options, ['--two', '--one'])
128
        self.assertEqual({'format':'one'}, opts)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
129
        opts, args = self.parse(options, ['--two', '--one',
2221.4.1 by Aaron Bentley
Get registry options working
130
                                          '--format', 'two'])
131
        self.assertEqual({'format':'two'}, opts)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
132
        options = [option.RegistryOption('format', '', registry, str,
133
                   enum_switch=False)]
134
        self.assertRaises(errors.BzrCommandError, self.parse, options,
135
                          ['--format', 'two'])
2221.4.1 by Aaron Bentley
Get registry options working
136
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
137
    def test_override(self):
138
        options = [option.Option('hello', type=str),
139
                   option.Option('hi', type=str, param_name='hello')]
140
        opts, args = self.parse(options, ['--hello', 'a', '--hello', 'b'])
141
        self.assertEqual('b', opts.hello)
142
        opts, args = self.parse(options, ['--hello', 'b', '--hello', 'a'])
143
        self.assertEqual('a', opts.hello)
144
        opts, args = self.parse(options, ['--hello', 'a', '--hi', 'b'])
145
        self.assertEqual('b', opts.hello)
146
        opts, args = self.parse(options, ['--hi', 'b', '--hello', 'a'])
147
        self.assertEqual('a', opts.hello)
148
2221.4.1 by Aaron Bentley
Get registry options working
149
    def test_registry_converter(self):
2221.4.9 by Aaron Bentley
Zap trailing whitespace
150
        options = [option.RegistryOption('format', '',
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
151
                   bzrdir.format_registry, bzrdir.format_registry.make_bzrdir)]
2221.4.1 by Aaron Bentley
Get registry options working
152
        opts, args = self.parse(options, ['--format', 'knit'])
153
        self.assertIsInstance(opts.format.repository_format,
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
154
                              knitrepo.RepositoryFormatKnit1)
2221.4.1 by Aaron Bentley
Get registry options working
155
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
156
    def test_from_kwargs(self):
157
        my_option = option.RegistryOption.from_kwargs('my-option',
158
            help='test option', short='be short', be_long='go long')
159
        self.assertEqual(['my-option'],
160
            [x[0] for x in my_option.iter_switches()])
161
        my_option = option.RegistryOption.from_kwargs('my-option',
162
            help='test option', title="My option", short='be short',
163
            be_long='go long', value_switches=True)
164
        self.assertEqual(['my-option', 'be-long', 'short'],
165
            [x[0] for x in my_option.iter_switches()])
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
166
        self.assertEqual('test option', my_option.help)
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
167
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
168
    def test_help(self):
169
        registry = bzrdir.BzrDirFormatRegistry()
170
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
171
        registry.register_metadir('two',
172
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
173
            'two help',
174
            )
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
175
        registry.register_metadir('hidden', 'RepositoryFormat7', 'hidden help',
176
            hidden=True)
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
177
        registry.set_default('one')
178
        options = [option.RegistryOption('format', 'format help', registry,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
179
                   str, value_switches=True, title='Formats')]
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
180
        parser = option.get_optparser(dict((o.name, o) for o in options))
181
        value = parser.format_option_help()
182
        self.assertContainsRe(value, 'format.*format help')
183
        self.assertContainsRe(value, 'one.*one help')
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
184
        self.assertContainsRe(value, 'Formats:\n *--format')
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
185
        self.assertNotContainsRe(value, 'hidden help')
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
186
1857.1.16 by Aaron Bentley
Add tests for iter_switches
187
    def test_iter_switches(self):
188
        opt = option.Option('hello', help='fg')
189
        self.assertEqual(list(opt.iter_switches()),
190
                         [('hello', None, None, 'fg')])
191
        opt = option.Option('hello', help='fg', type=int)
192
        self.assertEqual(list(opt.iter_switches()),
193
                         [('hello', None, 'ARG', 'fg')])
194
        opt = option.Option('hello', help='fg', type=int, argname='gar')
195
        self.assertEqual(list(opt.iter_switches()),
196
                         [('hello', None, 'GAR', 'fg')])
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
197
        registry = bzrdir.BzrDirFormatRegistry()
198
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
199
        registry.register_metadir('two',
200
                'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
201
                'two help',
202
                )
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
203
        registry.set_default('one')
204
        opt = option.RegistryOption('format', 'format help', registry,
205
                                    value_switches=False)
206
        self.assertEqual(list(opt.iter_switches()),
207
                         [('format', None, 'ARG', 'format help')])
208
        opt = option.RegistryOption('format', 'format help', registry,
209
                                    value_switches=True)
210
        self.assertEqual(list(opt.iter_switches()),
211
                         [('format', None, 'ARG', 'format help'),
2221.4.9 by Aaron Bentley
Zap trailing whitespace
212
                          ('default', None, None, 'one help'),
213
                          ('one', None, None, 'one help'),
214
                          ('two', None, None, 'two help'),
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
215
                          ])
1857.1.16 by Aaron Bentley
Add tests for iter_switches
216
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
217
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
218
class TestListOptions(TestCase):
219
    """Tests for ListOption, used to specify lists on the command-line."""
220
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
221
    def parse(self, options, args):
222
        parser = option.get_optparser(dict((o.name, o) for o in options))
223
        return parser.parse_args(args)
224
225
    def test_list_option(self):
226
        options = [option.ListOption('hello', type=str)]
227
        opts, args = self.parse(options, ['--hello=world', '--hello=sailor'])
228
        self.assertEqual(['world', 'sailor'], opts.hello)
229
230
    def test_list_option_no_arguments(self):
231
        options = [option.ListOption('hello', type=str)]
232
        opts, args = self.parse(options, [])
233
        self.assertEqual([], opts.hello)
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
234
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
235
    def test_list_option_with_int_type(self):
236
        options = [option.ListOption('hello', type=int)]
237
        opts, args = self.parse(options, ['--hello=2', '--hello=3'])
238
        self.assertEqual([2, 3], opts.hello)
239
240
    def test_list_option_with_int_type_can_be_reset(self):
241
        options = [option.ListOption('hello', type=int)]
242
        opts, args = self.parse(options, ['--hello=2', '--hello=3',
243
                                          '--hello=-', '--hello=5'])
244
        self.assertEqual([5], opts.hello)
245
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
246
    def test_list_option_can_be_reset(self):
247
        """Passing an option of '-' to a list option should reset the list."""
248
        options = [option.ListOption('hello', type=str)]
249
        opts, args = self.parse(
250
            options, ['--hello=a', '--hello=b', '--hello=-', '--hello=c'])
251
        self.assertEqual(['c'], opts.hello)
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
252
253
254
class TestOptionDefinitions(TestCase):
255
    """Tests for options in the Bazaar codebase."""
256
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
257
    def get_builtin_command_options(self):
258
        g = []
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
259
        for cmd_name, cmd_class in sorted(commands.get_all_cmds()):
260
            cmd = cmd_class()
261
            for opt_name, opt in sorted(cmd.options().items()):
262
                g.append((cmd_name, opt))
263
        return g
264
2598.1.7 by Martin Pool
Add failing test that global options are all used.
265
    def test_global_options_used(self):
266
        # In the distant memory, options could only be declared globally.  Now
267
        # we prefer to declare them in the command, unless like -r they really
268
        # are used very widely with the exact same meaning.  So this checks
269
        # for any that should be garbage collected.
270
        g = dict(option.Option.OPTIONS.items())
2598.1.9 by Martin Pool
Add failing test that global options are used at least twice
271
        used_globals = {}
2598.1.7 by Martin Pool
Add failing test that global options are all used.
272
        msgs = []
273
        for cmd_name, cmd_class in sorted(commands.get_all_cmds()):
274
            for option_or_name in sorted(cmd_class.takes_options):
275
                if not isinstance(option_or_name, basestring):
276
                    self.assertIsInstance(option_or_name, option.Option)
277
                elif not option_or_name in g:
278
                    msgs.append("apparent reference to undefined "
279
                        "global option %r from %r"
280
                        % (option_or_name, cmd_class))
281
                else:
2598.1.9 by Martin Pool
Add failing test that global options are used at least twice
282
                    used_globals.setdefault(option_or_name, []).append(cmd_name)
283
        unused_globals = set(g.keys()) - set(used_globals.keys())
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
284
        # not enforced because there might be plugins that use these globals
285
        ## for option_name in sorted(unused_globals):
286
        ##    msgs.append("unused global option %r" % option_name)
287
        ## for option_name, cmds in sorted(used_globals.items()):
288
        ##     if len(cmds) <= 1:
289
        ##         msgs.append("global option %r is only used by %r"
290
        ##                 % (option_name, cmds))
2598.1.7 by Martin Pool
Add failing test that global options are all used.
291
        if msgs:
292
            self.fail("problems with global option definitions:\n"
293
                    + '\n'.join(msgs))
294
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
295
    def test_option_grammar(self):
296
        msgs = []
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
297
        # Option help should be written in sentence form, and have a final
298
        # period and be all on a single line, because the display code will
299
        # wrap it.
300
        option_re = re.compile(r'^[A-Z][^\n]+\.$')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
301
        for scope, option in self.get_builtin_command_options():
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
302
            if not option.help:
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
303
                msgs.append('%-16s %-16s %s' %
304
                       ((scope or 'GLOBAL'), option.name, 'NO HELP'))
2598.1.7 by Martin Pool
Add failing test that global options are all used.
305
            elif not option_re.match(option.help):
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
306
                msgs.append('%-16s %-16s %s' %
307
                        ((scope or 'GLOBAL'), option.name, option.help))
308
        if msgs:
309
            self.fail("The following options don't match the style guide:\n"
310
                    + '\n'.join(msgs))
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
311
312
    def test_is_hidden(self):
313
        registry = bzrdir.BzrDirFormatRegistry()
1551.18.13 by Aaron Bentley
Update test from review suggestions
314
        registry.register_metadir('hidden', 'HiddenFormat',
315
            'hidden help text', hidden=True)
316
        registry.register_metadir('visible', 'VisibleFormat',
317
            'visible help text', hidden=False)
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
318
        format = option.RegistryOption('format', '', registry, str)
319
        self.assertTrue(format.is_hidden('hidden'))
320
        self.assertFalse(format.is_hidden('visible'))