Argh, damn. Last one:
[[[
* subversion/tests/cmdline/svntest/main.py
(_create_parser): Partially revert r1297676, other code needs
options.verbose.
(_parse_options): Call logger.setLevel(logging.DEBUG) if verbose
output is requested.
]]]
On Tuesday, March 06, 2012 12:50:30 pm Alexey Neyman wrote:
> Please use the attached patch instead (the first one fixed "--list", but
> not "--list --verbose").
>
> Regards,
> Alexey.
>
> On Tuesday, March 06, 2012 12:45:21 pm Alexey Neyman wrote:
> > Hi all,
> >
> > Revision 1297676 by hwright broke the command line tests' --list option
> > (and probably, some other interfaces): the options dict no longer
> > contains verbose option as --verbose handler was changed from
> > 'store_true' to 'callback'. The attached patch fixes it by reintroducing
> > options.verbose.
> >
> > [[[
> > * subversion/tests/cmdline/svntest/main.py
> >
> > (_create_parser): Set options.verbose to False by default, override
> > with
> >
> > True from set_log_debug() callback.
> >
> > ]]]
> >
> > Regards,
> > Alexey.
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py (revision 1297679)
+++ subversion/tests/cmdline/svntest/main.py (working copy)
@@ -1469,9 +1469,6 @@
def _create_parser():
"""Return a parser for our test suite."""
- def set_log_debug(option, opt, value, parser):
- logger.setLevel(logging.DEBUG)
-
# set up the parser
_default_http_library = 'serf'
usage = 'usage: %prog [options] [<test> ...]'
@@ -1480,8 +1477,7 @@
help='Print test doc strings instead of running them')
parser.add_option('--milestone-filter', action='store', dest='milestone_filter',
help='Limit --list to those with target milestone specified')
- parser.add_option('-v', '--verbose', action='callback',
- callback=set_log_debug,
+ parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
help='Print binary command-lines (not with --quiet)')
parser.add_option('-q', '--quiet', action='store_true',
help='Print only unexpected results (not with --verbose)')
@@ -1550,6 +1546,9 @@
parser = _create_parser()
(options, args) = parser.parse_args(arglist)
+ if options.verbose:
+ logger.setLevel(logging.DEBUG)
+
# some sanity checking
if options.fsfs_packing and not options.fsfs_sharding:
parser.error("--fsfs-packing requires --fsfs-sharding")
