Author: stefan2
Date: Sun Jan 5 14:34:46 2014
New Revision: 1555517
URL: http://svn.apache.org/r1555517
Log:
On the 1.8.x-r1536854 branch, remove a test that depends on
/trunk features.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_invalid_path_changes): Drop.
(test_list): Update.
Modified:
subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py
Modified:
subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py?rev=1555517&r1=1555516&r2=1555517&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++
subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py
Sun Jan 5 14:34:46 2014
@@ -1844,118 +1844,6 @@ def recover_old(sbox):
svntest.main.create_repos(sbox.repo_dir, minor_version=0)
svntest.main.run_svnadmin("recover", sbox.repo_dir)
-@SkipUnless(svntest.main.is_fs_type_fsfs)
-def verify_invalid_path_changes(sbox):
- "detect invalid changed path list entries"
-
- sbox.build(create_wc = False)
- repo_url = sbox.repo_url
- B_url = sbox.repo_url + '/B'
- C_url = sbox.repo_url + '/C'
-
- # Create A/B/E/bravo in r2.
- for r in range(2,20):
- svntest.actions.run_and_verify_svn(None, None, [],
- 'mkdir', '-m', 'log_msg',
- sbox.repo_url + '/B' + str(r))
-
- # modify every other revision to make sure that errors are not simply
- # "carried over" but that all corrupts we get detected independently
-
- # add existing node
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '2'),
- "_0.0.t1-1 add-dir false false /A\n\n")
-
- # add into non-existent parent
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '4'),
- "_0.0.t3-2 add-dir false false /C/X\n\n")
-
- # del non-existent node
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '6'),
- "_0.0.t5-2 del-dir false false /C\n\n")
-
- # del existent node of the wrong kind
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '8'),
- "_0.0.t7-2 dev-file false false /B3\n\n")
-
- # copy from non-existent node
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '10'),
- "_0.0.t9-2 add-dir false false /B10\n"
- "6 /B8\n")
-
- # copy from existing node of the wrong kind
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '12'),
- "_0.0.t11-2 add-file false false /B12\n"
- "9 /B8\n")
-
- # modify non-existent node
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '14'),
- "_0.0.t13-2 modify-file false false /A/D/H/foo\n\n")
-
- # modify existent node of the wrong kind
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '16'),
- "_0.0.t15-2 modify-file false false /B12\n\n")
-
- # replace non-existent node
- set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '18'),
- "_0.0.t17-2 replace-file false false /A/D/H/foo\n\n")
-
- # find corruptions
- exit_code, output, errput = svntest.main.run_svnadmin("verify",
- "--keep-going",
- sbox.repo_dir)
-
- exp_out = svntest.verify.RegexListOutput([".*Verifying repository metadata",
- ".*Verified revision 0.",
- ".*Verified revision 1.",
- ".*Error verifying revision 2.",
- ".*Verified revision 3.",
- ".*Error verifying revision 4.",
- ".*Verified revision 5.",
- ".*Error verifying revision 6.",
- ".*Verified revision 7.",
- ".*Error verifying revision 8.",
- ".*Verified revision 9.",
- ".*Error verifying revision 10.",
- ".*Verified revision 11.",
- ".*Error verifying revision 12.",
- ".*Verified revision 13.",
- ".*Error verifying revision 14.",
- ".*Verified revision 15.",
- ".*Error verifying revision 16.",
- ".*Verified revision 17.",
- ".*Error verifying revision 18.",
- ".*Verified revision 19."])
-
- exp_err = svntest.verify.RegexListOutput(["svnadmin: E160020:.*",
- "svnadmin: E165011:.*"], False)
-
-
- if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
- output, errput, exp_out, exp_err):
- raise svntest.Failure
-
- exit_code, output, errput = svntest.main.run_svnadmin("verify",
- sbox.repo_dir)
-
- exp_out = svntest.verify.RegexListOutput([".*Verifying repository metadata",
- ".*Verified revision 0.",
- ".*Verified revision 1.",
- ".*Error verifying revision 2."])
-
- if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
- output, errput, exp_out, exp_err):
- raise svntest.Failure
-
-
- exit_code, output, errput = svntest.main.run_svnadmin("verify",
- "--quiet",
- sbox.repo_dir)
-
- if svntest.verify.verify_outputs("Output of 'svnadmin verify' is
unexpected.",
- None, errput, None, "svnadmin: E165011:.*"):
- raise svntest.Failure
-
########################################################################
# Run the tests
@@ -1992,7 +1880,6 @@ test_list = [ None,
locking,
mergeinfo_race,
recover_old,
- verify_invalid_path_changes,
]
if __name__ == '__main__':
