Author: prabhugs
Date: Thu Jul 4 13:11:03 2013
New Revision: 1499741
URL: http://svn.apache.org/r1499741
Log:
Fix the test case to check for summary if keep-going is true.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going): Fix the test case's expected output to check for
the summary if keep-going is true.
* subversion/svnadmin/svnadmin.c
(repos_notify_handler): Formatting tweak.
Modified:
subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c?rev=1499741&r1=1499740&r2=1499741&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
(original)
+++ subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c Thu
Jul 4 13:11:03 2013
@@ -850,7 +850,7 @@ repos_notify_handler(void *baton,
case svn_repos_notify_failure_summary:
if (notify->revision != SVN_INVALID_REVNUM)
cmdline_stream_printf(feedback_stream, scratch_pool,
- _("Revision %ld: %s \n"),
+ _("r%ld: %s \n"),
notify->revision, notify->warning_str);
return;
Modified:
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py?rev=1499741&r1=1499740&r2=1499741&view=diff
==============================================================================
---
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Thu Jul 4 13:11:03 2013
@@ -1856,7 +1856,10 @@ def verify_keep_going(sbox):
".*Verified revision 0.",
".*Verified revision 1.",
".*Error verifying revision 2.",
- ".*Verified revision 3."])
+ ".*Verified revision 3.*",
+ ".*",
+ ".*Summary.*",
+ ".*E160004:.*"])
exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
"svnadmin: E165011:.*"], False)
