Author: kotkov
Date: Mon Nov 27 10:54:39 2017
New Revision: 1816424
URL: http://svn.apache.org/viewvc?rev=1816424&view=rev
Log:
Following up on r1816402, add a whitelist of the supported templated
repository versions to the svnadmin tests that patch the revision files.
The hardcoded manipulations are not valid for higher formats such as v7,
and since they get the revision file paths based on the server_minor_version,
may also break with older prepackaged versions. Therefore, we limit the
whitelist to v4 and v6.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_incremental_fsfs, verify_non_utf8_paths): Limit the supported
prepackaged repository versions to v4 and v6.
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=1816424&r1=1816423&r2=1816424&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Nov 27
10:54:39 2017
@@ -790,6 +790,10 @@ def fsfs_file(repo_dir, kind, rev):
def verify_incremental_fsfs(sbox):
"""svnadmin verify detects corruption dump can't"""
+ if svntest.main.options.fsfs_version is not None and \
+ svntest.main.options.fsfs_version not in [4, 6]:
+ raise svntest.Skip("Unsupported prepackaged repository version")
+
# setup a repo with a directory 'c:hi'
# use physical addressing as this is hard to provoke with logical addressing
sbox.build(create_wc = False,
@@ -1654,6 +1658,10 @@ text
def verify_non_utf8_paths(sbox):
"svnadmin verify with non-UTF-8 paths"
+ if svntest.main.options.fsfs_version is not None and \
+ svntest.main.options.fsfs_version not in [4, 6]:
+ raise svntest.Skip("Unsupported prepackaged repository version")
+
dumpfile = clean_dumpfile()
# Corruption only possible in physically addressed revisions created
