You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/01/13 12:40:16 UTC
svn commit: r1651326 -
/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Author: julianfoad
Date: Tue Jan 13 11:40:16 2015
New Revision: 1651326
URL: http://svn.apache.org/r1651326
Log:
* subversion/tests/cmdline/svndumpfilter_tests.py
(filter_and_return_output): Simplify Python coding.
Modified:
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1651326&r1=1651325&r2=1651326&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Tue Jan 13 11:40:16 2015
@@ -60,15 +60,10 @@ def filter_and_return_output(dump, bufsi
dump = [ dump ]
# Does the caller want the stderr?
- try:
- varargs.index('-q')
+ if '-q' in varargs or '--quiet' in varargs:
expected_errput = None # Stderr with -q or --quiet is a real error!
- except:
- try:
- varargs.index('--quiet')
- expected_errput = None
- except:
- expected_errput = svntest.verify.AnyOutput
+ else:
+ expected_errput = svntest.verify.AnyOutput
## TODO: Should we handle exit_code?
exit_code, output, errput = svntest.main.run_command_stdin(
svntest.main.svndumpfilter_binary, expected_errput, bufsize, True,