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/03/18 14:48:55 UTC
svn commit: r1457766 -
/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Author: prabhugs
Date: Mon Mar 18 13:48:55 2013
New Revision: 1457766
URL: http://svn.apache.org/r1457766
Log:
Use RegexListOutput to generate the expected error so that the repository name
is not specified in the expected error list.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going): Use RegexListOutput to generate the expected error
list. The expected error list looks cleaner.
Modified:
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
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=1457766&r1=1457765&r2=1457766&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 Mar 18 13:48:55 2013
@@ -1877,13 +1877,13 @@ _0.0.t1-1 Add-dir false false /B
"--keep-going",
sbox.repo_dir)
- exp_err = ["* Verifying repository metadata ...\n",
- "* Verified revision 0.\n",
- "* Verified revision 1.\n",
- "* Error verifying revision 2.\n",
- "svnadmin: E160004: Invalid change kind in rev file\n",
- "* Verified revision 3.\n",
- "svnadmin: E165005: Repository 'svn-test-work/repositories/svnadmin_tests-31' failed to verify\n"]
+ exp_err = svntest.verify.RegexListOutput([".*Verifying repository metadata",
+ ".*Verified revision 0.",
+ ".*Verified revision 1.",
+ ".*Error verifying revision 2.",
+ ".*svnadmin: E160004:",
+ ".*Verified revision 3.",
+ "svnadmin: E165005:.*"])
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
[], errput, None, exp_err):
@@ -1892,12 +1892,12 @@ _0.0.t1-1 Add-dir false false /B
exit_code, output, errput = svntest.main.run_svnadmin("verify",
sbox.repo_dir)
- exp_err = ["* Verifying repository metadata ...\n",
- "* Verified revision 0.\n",
- "* Verified revision 1.\n",
- "* Error verifying revision 2.\n",
- "svnadmin: E160004: Invalid change kind in rev file\n",
- "svnadmin: E165005: Repository 'svn-test-work/repositories/svnadmin_tests-31' failed to verify\n"]
+ exp_err = svntest.verify.RegexListOutput([".* Verifying repository metadata",
+ ".*Verified revision 0.",
+ ".*Verified revision 1.",
+ ".*Error verifying revision 2.",
+ "svnadmin: E160004:.*",
+ "svnadmin: E165005:.*"])
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
[], errput, None, exp_err):