Author: philip
Date: Mon Jul 6 20:34:13 2015
New Revision: 1689494
URL: http://svn.apache.org/r1689494
Log:
Fix svnadmin_tests.py tests 34 and 35 to pass when sharded, skip
tests 32, 33 and 34 when packed.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going, verify_keep_going_quiet): Skip when packed.
(verify_invalid_path_changes): Adjust expected output for sharding,
skip when packed.
(verify_denormalized_names): Adjust expected output for sharding.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1689494&r1=1689493&r2=1689494&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Jul 6
20:34:13 2015
@@ -2058,6 +2058,10 @@ def recover_old_empty(sbox):
def verify_keep_going(sbox):
"svnadmin verify --keep-going test"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
B_url = sbox.repo_url + '/B'
@@ -2158,6 +2162,10 @@ def verify_keep_going(sbox):
def verify_keep_going_quiet(sbox):
"svnadmin verify --keep-going --quiet test"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
B_url = sbox.repo_url + '/B'
@@ -2208,6 +2216,10 @@ def verify_keep_going_quiet(sbox):
def verify_invalid_path_changes(sbox):
"detect invalid changed path list entries"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
@@ -2297,8 +2309,11 @@ def verify_invalid_path_changes(sbox):
".*r18: E160013:.*"])
if (svntest.main.fs_has_rep_sharing()):
exp_out.insert(0, ".*Verifying.*metadata.*")
- if svntest.main.is_fs_log_addressing():
- exp_out.insert(1, ".*Verifying.*metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 19 / svntest.main.options.fsfs_sharding):
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+ if svntest.main.is_fs_log_addressing():
+ exp_out.insert(0, ".*Verifying.*metadata.*")
exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.",
"svnadmin: E160020:.*",
@@ -2341,8 +2356,12 @@ def verify_invalid_path_changes(sbox):
if (svntest.main.fs_has_rep_sharing()):
exp_out.insert(0, ".*Verifying.*metadata.*")
- if svntest.main.is_fs_log_addressing():
- exp_out.insert(1, ".*Verifying.*metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 19 / svntest.main.options.fsfs_sharding):
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+ if svntest.main.is_fs_log_addressing():
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
output, errput, exp_out, exp_err):
raise svntest.Failure
@@ -2398,6 +2417,10 @@ def verify_denormalized_names(sbox):
if (svntest.main.fs_has_rep_sharing()):
expected_output_regex_list.insert(0, ".*Verifying repository metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 7 / svntest.main.options.fsfs_sharding):
+ expected_output_regex_list.insert(0, ".*Verifying.*metadata.*")
+
if svntest.main.is_fs_log_addressing():
expected_output_regex_list.insert(0, ".* Verifying metadata at revision
0.*")
