FAIL: test_option_grammar (bzrlib.tests.test_options.TestOptionDefinitions)

[Bob Tanner]

Testsuite failing on 1.13.1.

...tions.TestOptionDefinitions.test_option_grammar FAIL 9ms
    The following options don't match the style guide:
conflict-diff new blah

======================================================================
FAIL: test_option_grammar (bzrlib.tests.test_options.TestOptionDefinitions)

vvvv[log from bzrlib.tests.test_options.TestOptionDefinitions.test_option_grammar]

^^^^[log from bzrlib.tests.test_options.TestOptionDefinitions.test_option_grammar]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmp_bzr_check_dist.PygabX3936/bzr-1.13.1/bzrlib/tests/test_options.py", line 374, in test_option_grammar
    + '\n'.join(msgs))
AssertionError: The following options don't match the style guide:
conflict-diff new blah

[Vincent Ladeuil (vila)]

Don't worry about it for the release, it's in bzrtools:
=== modified file 'command_classes.py'
--- command_classes.py 2009-03-11 06:44:59 +0000
+++ command_classes.py 2009-03-18 15:03:30 +0000
@@ -521,7 +521,7 @@
     encoding_type = 'exact'
     takes_args = ['file']
     takes_options = [
- RegistryOption.from_kwargs('new', 'blah', value_switches=True,
+ RegistryOption.from_kwargs('new', 'Blah.', value_switches=True,
             enum_switch=False,
             other='Compare OTHER against common base.',
             this='Compare THIS against common base.')]

I haven't find the time to send the patch yet :-/

[Christian Faulhammer (fauli)]

Vincent, is this fix still needed? The lines are not to be found in bzrtools anymore.

[Vincent Ladeuil (vila)]

@Christian, I'm pretty sure this has been fixed long ago, the option is called direction now.