13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
17
from bzrlib import (
27
from bzrlib.builtins import cmd_commit
28
from bzrlib.commands import parse_args
25
from bzrlib.builtins import cmd_commit, cmd_log, cmd_status
26
from bzrlib.commands import Command, parse_args
29
27
from bzrlib.tests import TestCase
30
28
from bzrlib.repofmt import knitrepo
33
30
def parse(options, args):
34
31
parser = option.get_optparser(dict((o.name, o) for o in options))
35
32
return parser.parse_args(args)
38
34
class OptionTests(TestCase):
39
35
"""Command-line option tests"""
41
37
def test_parse_args(self):
42
38
"""Option parser"""
43
# XXX: Using cmd_commit makes these tests overly sensitive to changes
44
# to cmd_commit, when they are meant to be about option parsing in
47
([], {'author': [], 'exclude': [], 'fixes': [], 'help': True}),
48
parse_args(cmd_commit(), ['--help']))
50
([], {'author': [], 'exclude': [], 'fixes': [], 'message': 'biter'}),
51
parse_args(cmd_commit(), ['--message=biter']))
39
eq = self.assertEquals
40
eq(parse_args(cmd_commit(), ['--help']),
42
eq(parse_args(cmd_commit(), ['--message=biter']),
43
([], {'message': 'biter'}))
44
## eq(parse_args(cmd_log(), '-r 500'.split()),
45
## ([], {'revision': RevisionSpec_int(500)}))
53
47
def test_no_more_opts(self):
54
48
"""Terminated options"""
56
(['-file-with-dashes'], {'author': [], 'exclude': [], 'fixes': []}),
57
parse_args(cmd_commit(), ['--', '-file-with-dashes']))
49
self.assertEquals(parse_args(cmd_commit(), ['--', '-file-with-dashes']),
50
(['-file-with-dashes'], {}))
59
52
def test_option_help(self):
60
53
"""Options have help strings."""
61
out, err = self.run_bzr('commit --help')
62
self.assertContainsRe(out,
63
r'--file(.|\n)*Take commit message from this file\.')
54
out, err = self.run_bzr_captured(['commit', '--help'])
55
self.assertContainsRe(out, r'--file(.|\n)*file containing commit'
64
57
self.assertContainsRe(out, r'-h.*--help')
66
59
def test_option_help_global(self):
67
60
"""Global options have help strings."""
68
out, err = self.run_bzr('help status')
69
self.assertContainsRe(out, r'--show-ids.*Show internal object.')
71
def test_option_help_global_hidden(self):
72
"""Hidden global options have no help strings."""
73
out, err = self.run_bzr('help log')
74
self.assertNotContainsRe(out, r'--message')
61
out, err = self.run_bzr_captured(['help', 'status'])
62
self.assertContainsRe(out, r'--show-ids.*show internal object')
76
64
def test_option_arg_help(self):
77
65
"""Help message shows option arguments."""
78
out, err = self.run_bzr('help commit')
79
self.assertEqual(err, '')
66
out, err = self.run_bzr_captured(['help', 'commit'])
67
self.assertEquals(err, '')
80
68
self.assertContainsRe(out, r'--file[ =]MSGFILE')
82
70
def test_unknown_short_opt(self):
83
out, err = self.run_bzr('help -r', retcode=3)
71
out, err = self.run_bzr_captured(['help', '-r'], retcode=3)
84
72
self.assertContainsRe(err, r'no such option')
74
def test_get_short_name(self):
75
file_opt = option.Option.OPTIONS['file']
76
self.assertEquals(file_opt.short_name(), 'F')
77
force_opt = option.Option.OPTIONS['force']
78
self.assertEquals(force_opt.short_name(), None)
86
80
def test_set_short_name(self):
87
81
o = option.Option('wiggle')
88
82
o.set_short_name('w')
89
83
self.assertEqual(o.short_name(), 'w')
85
def test_old_short_names(self):
86
# test the deprecated method for getting and setting short option
89
"access to SHORT_OPTIONS was deprecated in version 0.14."
90
" Set the short option name when constructing the Option.",
91
DeprecationWarning, 2)
93
def capture_warning(message, category, stacklevel=None):
94
_warnings.append((message, category, stacklevel))
95
old_warning_method = symbol_versioning.warn
97
# an example of the kind of thing plugins might want to do through
98
# the old interface - make a new option and then give it a short
100
symbol_versioning.set_warning_method(capture_warning)
101
example_opt = option.Option('example', help='example option')
102
option.Option.SHORT_OPTIONS['w'] = example_opt
103
self.assertEqual(example_opt.short_name(), 'w')
104
self.assertEqual([expected_warning], _warnings)
105
# now check that it can actually be parsed with the registered
107
opts, args = parse([example_opt], ['-w', 'foo'])
108
self.assertEqual(opts.example, True)
109
self.assertEqual(args, ['foo'])
111
symbol_versioning.set_warning_method(old_warning_method)
91
113
def test_allow_dash(self):
92
114
"""Test that we can pass a plain '-' as an argument."""
93
self.assertEqual((['-']), parse_args(cmd_commit(), ['-'])[0])
115
self.assertEqual((['-'], {}), parse_args(cmd_commit(), ['-']))
95
117
def parse(self, options, args):
96
118
parser = option.get_optparser(dict((o.name, o) for o in options))
146
164
self.assertRaises(errors.BzrCommandError, self.parse, options,
147
165
['--format', 'two'])
149
def test_override(self):
150
options = [option.Option('hello', type=str),
151
option.Option('hi', type=str, param_name='hello')]
152
opts, args = self.parse(options, ['--hello', 'a', '--hello', 'b'])
153
self.assertEqual('b', opts.hello)
154
opts, args = self.parse(options, ['--hello', 'b', '--hello', 'a'])
155
self.assertEqual('a', opts.hello)
156
opts, args = self.parse(options, ['--hello', 'a', '--hi', 'b'])
157
self.assertEqual('b', opts.hello)
158
opts, args = self.parse(options, ['--hi', 'b', '--hello', 'a'])
159
self.assertEqual('a', opts.hello)
161
167
def test_registry_converter(self):
162
168
options = [option.RegistryOption('format', '',
163
controldir.format_registry, controldir.format_registry.make_bzrdir)]
169
bzrdir.format_registry, bzrdir.format_registry.make_bzrdir)]
164
170
opts, args = self.parse(options, ['--format', 'knit'])
165
171
self.assertIsInstance(opts.format.repository_format,
166
172
knitrepo.RepositoryFormatKnit1)
168
def test_lazy_registry(self):
169
options = [option.RegistryOption('format', '',
170
lazy_registry=('bzrlib.controldir','format_registry'),
172
opts, args = self.parse(options, ['--format', 'knit'])
173
self.assertEqual({'format': 'knit'}, opts)
175
errors.BadOptionValue, self.parse, options, ['--format', 'BAD'])
177
174
def test_from_kwargs(self):
178
175
my_option = option.RegistryOption.from_kwargs('my-option',
179
176
help='test option', short='be short', be_long='go long')
235
231
('two', None, None, 'two help'),
238
def test_option_callback_bool(self):
239
"Test booleans get True and False passed correctly to a callback."""
241
def cb(option, name, value, parser):
242
cb_calls.append((option,name,value,parser))
243
options = [option.Option('hello', custom_callback=cb)]
244
opts, args = self.parse(options, ['--hello', '--no-hello'])
245
self.assertEqual(2, len(cb_calls))
246
opt,name,value,parser = cb_calls[0]
247
self.assertEqual('hello', name)
248
self.assertTrue(value)
249
opt,name,value,parser = cb_calls[1]
250
self.assertEqual('hello', name)
251
self.assertFalse(value)
253
def test_option_callback_str(self):
254
"""Test callbacks work for string options both long and short."""
256
def cb(option, name, value, parser):
257
cb_calls.append((option,name,value,parser))
258
options = [option.Option('hello', type=str, custom_callback=cb,
260
opts, args = self.parse(options, ['--hello', 'world', '-h', 'mars'])
261
self.assertEqual(2, len(cb_calls))
262
opt,name,value,parser = cb_calls[0]
263
self.assertEqual('hello', name)
264
self.assertEqual('world', value)
265
opt,name,value,parser = cb_calls[1]
266
self.assertEqual('hello', name)
267
self.assertEqual('mars', value)
270
class TestListOptions(TestCase):
271
"""Tests for ListOption, used to specify lists on the command-line."""
273
def parse(self, options, args):
274
parser = option.get_optparser(dict((o.name, o) for o in options))
275
return parser.parse_args(args)
277
def test_list_option(self):
278
options = [option.ListOption('hello', type=str)]
279
opts, args = self.parse(options, ['--hello=world', '--hello=sailor'])
280
self.assertEqual(['world', 'sailor'], opts.hello)
282
def test_list_option_with_dash(self):
283
options = [option.ListOption('with-dash', type=str)]
284
opts, args = self.parse(options, ['--with-dash=world',
285
'--with-dash=sailor'])
286
self.assertEqual(['world', 'sailor'], opts.with_dash)
288
def test_list_option_no_arguments(self):
289
options = [option.ListOption('hello', type=str)]
290
opts, args = self.parse(options, [])
291
self.assertEqual([], opts.hello)
293
def test_list_option_with_int_type(self):
294
options = [option.ListOption('hello', type=int)]
295
opts, args = self.parse(options, ['--hello=2', '--hello=3'])
296
self.assertEqual([2, 3], opts.hello)
298
def test_list_option_with_int_type_can_be_reset(self):
299
options = [option.ListOption('hello', type=int)]
300
opts, args = self.parse(options, ['--hello=2', '--hello=3',
301
'--hello=-', '--hello=5'])
302
self.assertEqual([5], opts.hello)
304
def test_list_option_can_be_reset(self):
305
"""Passing an option of '-' to a list option should reset the list."""
306
options = [option.ListOption('hello', type=str)]
307
opts, args = self.parse(
308
options, ['--hello=a', '--hello=b', '--hello=-', '--hello=c'])
309
self.assertEqual(['c'], opts.hello)
311
def test_option_callback_list(self):
312
"""Test callbacks work for list options."""
314
def cb(option, name, value, parser):
315
# Note that the value is a reference so copy to keep it
316
cb_calls.append((option,name,value[:],parser))
317
options = [option.ListOption('hello', type=str, custom_callback=cb)]
318
opts, args = self.parse(options, ['--hello=world', '--hello=mars',
320
self.assertEqual(3, len(cb_calls))
321
opt,name,value,parser = cb_calls[0]
322
self.assertEqual('hello', name)
323
self.assertEqual(['world'], value)
324
opt,name,value,parser = cb_calls[1]
325
self.assertEqual('hello', name)
326
self.assertEqual(['world', 'mars'], value)
327
opt,name,value,parser = cb_calls[2]
328
self.assertEqual('hello', name)
329
self.assertEqual([], value)
331
def test_list_option_param_name(self):
332
"""Test list options can have their param_name set."""
333
options = [option.ListOption('hello', type=str, param_name='greeting')]
334
opts, args = self.parse(
335
options, ['--hello=world', '--hello=sailor'])
336
self.assertEqual(['world', 'sailor'], opts.greeting)
339
class TestOptionDefinitions(TestCase):
340
"""Tests for options in the Bazaar codebase."""
342
def get_builtin_command_options(self):
344
commands.install_bzr_command_hooks()
345
for cmd_name in sorted(commands.builtin_command_names()):
346
cmd = commands.get_cmd_object(cmd_name)
347
for opt_name, opt in sorted(cmd.options().items()):
348
g.append((cmd_name, opt))
352
def test_option_grammar(self):
354
# Option help should be written in sentence form, and have a final
355
# period with an optional bracketed suffix. All the text should be on
356
# one line, because the display code will wrap it.
357
option_re = re.compile(r'^[A-Z][^\n]+\.(?: \([^\n]+\))?$')
358
for scope, opt in self.get_builtin_command_options():
359
for name, _, _, helptxt in opt.iter_switches():
361
name = "/".join([opt.name, name])
363
msgs.append('%-16s %-16s %s' %
364
((scope or 'GLOBAL'), name, 'NO HELP'))
365
elif not option_re.match(helptxt):
366
if name.startswith("format/"):
367
# Don't complain about the odd format registry help
369
msgs.append('%-16s %-16s %s' %
370
((scope or 'GLOBAL'), name, helptxt))
372
self.fail("The following options don't match the style guide:\n"
376
class TestOptionMisc(TestCase):
378
def test_is_hidden(self):
379
registry = controldir.ControlDirFormatRegistry()
380
bzrdir.register_metadir(registry, 'hidden', 'HiddenFormat',
381
'hidden help text', hidden=True)
382
bzrdir.register_metadir(registry, 'visible', 'VisibleFormat',
383
'visible help text', hidden=False)
384
format = option.RegistryOption('format', '', registry, str)
385
self.assertTrue(format.is_hidden('hidden'))
386
self.assertFalse(format.is_hidden('visible'))
388
def test_short_name(self):
389
registry = controldir.ControlDirFormatRegistry()
390
opt = option.RegistryOption('format', help='', registry=registry)
391
self.assertEqual(None, opt.short_name())
392
opt = option.RegistryOption('format', short_name='F', help='',
394
self.assertEqual('F', opt.short_name())
396
def test_option_custom_help(self):
397
the_opt = option.Option.OPTIONS['help']
398
orig_help = the_opt.help[:]
399
my_opt = option.custom_help('help', 'suggest lottery numbers')
400
# Confirm that my_opt has my help and the original is unchanged
401
self.assertEqual('suggest lottery numbers', my_opt.help)
402
self.assertEqual(orig_help, the_opt.help)
404
def test_short_value_switches(self):
405
reg = registry.Registry()
406
reg.register('short', 'ShortChoice')
407
reg.register('long', 'LongChoice')
408
ropt = option.RegistryOption('choice', '', reg, value_switches=True,
409
short_value_switches={'short': 's'})
410
opts, args = parse([ropt], ['--short'])
411
self.assertEqual('ShortChoice', opts.choice)
412
opts, args = parse([ropt], ['-s'])
413
self.assertEqual('ShortChoice', opts.choice)
416
class TestVerboseQuietLinkage(TestCase):
418
def check(self, parser, level, args):
419
option._verbosity_level = 0
420
opts, args = parser.parse_args(args)
421
self.assertEqual(level, option._verbosity_level)
423
def test_verbose_quiet_linkage(self):
424
parser = option.get_optparser(option.Option.STD_OPTIONS)
425
self.check(parser, 0, [])
426
self.check(parser, 1, ['-v'])
427
self.check(parser, 2, ['-v', '-v'])
428
self.check(parser, -1, ['-q'])
429
self.check(parser, -2, ['-qq'])
430
self.check(parser, -1, ['-v', '-v', '-q'])
431
self.check(parser, 2, ['-q', '-v', '-v'])
432
self.check(parser, 0, ['--no-verbose'])
433
self.check(parser, 0, ['-v', '-q', '--no-quiet'])
234
# >>> parse_args('log -r 500'.split())
235
# (['log'], {'revision': [<RevisionSpec_int 500>]})
236
# >>> parse_args('log -r500..600'.split())
237
# (['log'], {'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
238
# >>> parse_args('log -vr500..600'.split())
239
# (['log'], {'verbose': True, 'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
240
# >>> parse_args('log -rrevno:500..600'.split()) #the r takes an argument
241
# (['log'], {'revision': [<RevisionSpec_revno revno:500>, <RevisionSpec_int 600>]})
added
removed
bzrlib/tests/test_options.py
