You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pr...@apache.org on 2013/06/10 14:49:23 UTC
svn commit: r1491440 - in /subversion/branches/verify-keep-going/subversion:
include/svn_error_codes.h tests/cmdline/svnadmin_tests.py
Author: prabhugs
Date: Mon Jun 10 12:49:22 2013
New Revision: 1491440
URL: http://svn.apache.org/r1491440
Log:
Correct the error code value for SVN_ERR_REPOS_CORRUPTED.
Fix the verify-keep-going test case to compare actual stdout and expected stdout.
* subversion/include/svn_error_codes.h
Set the correct error code value.
* subversion/tests/cmdline/svnadmin_tests.py
(verify-keep-going): Fix the error code value. Also compare actual stdout
and expected stdout in addition to stderr comparison.
Modified:
subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h?rev=1491440&r1=1491439&r2=1491440&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h Mon Jun 10 12:49:22 2013
@@ -818,10 +818,6 @@ SVN_ERROR_START
SVN_ERR_REPOS_CATEGORY_START + 4,
"Bogus revision report")
- SVN_ERRDEF(SVN_ERR_REPOS_CORRUPTED,
- SVN_ERR_REPOS_CATEGORY_START + 5,
- "Repository has corruptions")
-
/* This is analogous to SVN_ERR_FS_UNSUPPORTED_FORMAT. To avoid
* confusion with "versions" (i.e., releases) of Subversion, we
* started using the word "format" instead of "version". However,
@@ -854,6 +850,11 @@ SVN_ERROR_START
SVN_ERR_REPOS_CATEGORY_START + 10,
"Repository upgrade is not supported")
+ /** @since New in 1.8. */
+ SVN_ERRDEF(SVN_ERR_REPOS_CORRUPTED,
+ SVN_ERR_REPOS_CATEGORY_START + 11,
+ "Repository has corruptions")
+
/* generic RA errors */
SVN_ERRDEF(SVN_ERR_RA_ILLEGAL_URL,
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=1491440&r1=1491439&r2=1491440&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 Mon Jun 10 12:49:22 2013
@@ -1886,30 +1886,32 @@ _0.0.t1-1 Add-dir false false /B
"--keep-going",
sbox.repo_dir)
- exp_err = svntest.verify.RegexListOutput([".*Verifying repository metadata",
+ exp_out = svntest.verify.RegexListOutput([".*Verifying repository metadata",
".*Verified revision 0.",
".*Verified revision 1.",
".*Error verifying revision 2.",
- ".*svnadmin: E160004:",
- ".*Verified revision 3.",
- "svnadmin: E165005:.*"])
+ ".*Verified revision 3."])
+
+ exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
+ "svnadmin: E165011:.*"])
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
- [], errput, None, exp_err):
+ output, errput, exp_out, exp_err):
raise svntest.Failure
exit_code, output, errput = svntest.main.run_svnadmin("verify",
sbox.repo_dir)
- exp_err = svntest.verify.RegexListOutput([".* Verifying repository metadata",
+ exp_out = svntest.verify.RegexListOutput([".*Verifying repository metadata",
".*Verified revision 0.",
".*Verified revision 1.",
- ".*Error verifying revision 2.",
- "svnadmin: E160004:.*",
- "svnadmin: E165005:.*"])
+ ".*Error verifying revision 2."])
+
+ exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
+ "svnadmin: E165011:.*"])
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
- [], errput, None, exp_err):
+ output, errput, exp_out, exp_err):
raise svntest.Failure
@@ -1918,7 +1920,7 @@ _0.0.t1-1 Add-dir false false /B
sbox.repo_dir)
if svntest.verify.verify_outputs("Output of 'svnadmin verify' is unexpected.",
- None, errput, None, ".*svnadmin: E165005:.*"):
+ None, errput, None, "svnadmin: E165011:.*"):
raise svntest.Failure
########################################################################