Author: brane
Date: Thu Aug 21 14:17:29 2014
New Revision: 1619403
URL: http://svn.apache.org/r1619403
Log:
Make the svnadmin tests succed with FS_TYPE=fsfs-v6.
* subversion/tests/cmdline/svntest/main.py
(tests_use_prepacakaged_repository): New predicate.
* subversion/tests/cmdline/svnadmin_tests.py
(create_in_repo_subdir): Skip if the new predicate applies.
(load_ignore_dates): Ignore r0, its properties aren't affected by the
'svnadmin load' anyway.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.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=1619403&r1=1619402&r2=1619403&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Thu Aug 21
14:17:29 2014
@@ -1243,6 +1243,7 @@ def fsfs_recover_handle_missing_revs_or_
#----------------------------------------------------------------------
+@Skip(svntest.main.tests_use_prepacakaged_repository)
def create_in_repo_subdir(sbox):
"'svnadmin create /path/to/repo/subdir'"
@@ -2385,7 +2386,7 @@ def load_ignore_dates(sbox):
load_dumpstream(sbox, dumpfile_skeleton, '--ignore-dates')
svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
None, 'youngest', sbox.repo_dir)
- for rev in range(6):
+ for rev in range(1, 6):
exit_code, output, errput = svntest.main.run_svnlook('date', '-r', rev,
sbox.repo_dir)
if errput:
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1619403&r1=1619402&r2=1619403&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Aug 21
14:17:29 2014
@@ -1351,6 +1351,9 @@ def make_log_msg():
# Functions which check the test configuration
# (useful for conditional XFails)
+def tests_use_prepacakaged_repository():
+ return options.fsfs_version is not None
+
def is_ra_type_dav():
return options.test_area_url.startswith('http')
