Author: dsahlberg Date: Sat Sep 30 12:57:25 2023 New Revision: 1912626 URL: http://svn.apache.org/viewvc?rev=1912626&view=rev Log: Fix TypeError when running the test suite with --verbose.
* build/run_tests.py (create_parser): Simplify callback set_log_level and let --verbose set the value directly. * subversion/tests/cmdline/svntest/main.py (_create_parser): Simplify callback set_log_level and let --verbose set the value directly. Patch by: jun66j5 Discussed: https://lists.apache.org/thread/83wwbpb4cq8b9g6lvzlz28rh55gxsz6g Modified: subversion/trunk/build/run_tests.py subversion/trunk/subversion/tests/cmdline/svntest/main.py Modified: subversion/trunk/build/run_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1912626&r1=1912625&r2=1912626&view=diff ============================================================================== --- subversion/trunk/build/run_tests.py (original) +++ subversion/trunk/build/run_tests.py Sat Sep 30 12:57:25 2023 @@ -1034,17 +1034,19 @@ class TestHarness: def create_parser(): - def set_log_level(option, opt, value, parser, level=None): - if level is None: - level = value - parser.values.set_log_level = getattr(logging, level, None) or int(level) + def set_log_level(option, opt, value, parser): + if value.isdigit(): + value = int(value) + else: + value = getattr(logging, value) + parser.values.set_log_level = value parser = optparse.OptionParser(usage=__doc__); parser.add_option('-l', '--list', action='store_true', dest='list_tests', help='Print test doc strings instead of running them') - parser.add_option('-v', '--verbose', action='callback', - callback=set_log_level, callback_args=(logging.DEBUG, ), + parser.add_option('-v', '--verbose', action='store_const', + dest='set_log_level', const=logging.DEBUG, help='Print binary command-lines') parser.add_option('-c', '--cleanup', action='store_true', help='Clean up after successful tests') Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1912626&r1=1912625&r2=1912626&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sat Sep 30 12:57:25 2023 @@ -2188,13 +2188,12 @@ def _create_parser(usage=None): if logger.getEffectiveLevel() == logging.NOTSET: logger.setLevel(logging.WARN) - def set_log_level(option, opt, value, parser, level=None): - if level: - # called from --verbose - logger.setLevel(level) + def set_log_level(option, opt, value, parser): + if value.isdigit(): + level = int(value) else: - # called from --set-log-level - logger.setLevel(getattr(logging, value, None) or int(value)) + level = getattr(logging, value) + logger.setLevel(level) # Set up the parser. # If you add new options, consider adding them in @@ -2213,10 +2212,10 @@ def _create_parser(usage=None): 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_level, callback_args=(logging.DEBUG, ), + parser.add_option('-v', '--verbose', action='store_const', + dest='set_log_level', const=logging.DEBUG, help='Print binary command-lines (same as ' + - '"--set-log-level logging.DEBUG")') + '"--set-log-level DEBUG")') parser.add_option('-q', '--quiet', action='store_true', help='Print only unexpected results (not with --verbose)') parser.add_option('-p', '--parallel', action='store_const',
