Author: brane
Date: Thu Aug 21 14:03:17 2014
New Revision: 1619395
URL: http://svn.apache.org/r1619395
Log:
* subversion/tests/cmdline/svnadmin_tests.py
(freeze_same_uuid): We no longer have checked named atomics, so skip this
test with older server versions because it will hang otherwise.
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=1619395&r1=1619394&r2=1619395&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Thu Aug 21
14:03:17 2014
@@ -2896,7 +2896,8 @@ def fsfs_hotcopy_progress_old(sbox):
sbox.repo_dir, inc_backup_dir)
-@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(lambda: svntest.main.is_fs_type_fsfs()
+ and svntest.main.options.server_minor_version >= 9)
def freeze_same_uuid(sbox):
"freeze multiple repositories with same UUID"
@@ -2920,16 +2921,11 @@ def freeze_same_uuid(sbox):
svntest.actions.run_and_verify_load(second_repo_dir, dump_contents)
# ...and execute the 'svnadmin freeze -F' command.
- if svntest.main.options.server_minor_version < 9:
- expected_error = ".*svnadmin: E200043:.*"
- else:
- expected_error = None
-
arg_file = sbox.get_tempname()
svntest.main.file_write(arg_file,
"%s\n%s\n" % (first_repo_dir, second_repo_dir))
- svntest.actions.run_and_verify_svnadmin(None, None, expected_error,
+ svntest.actions.run_and_verify_svnadmin(None, None, None,
'freeze', '-F', arg_file, '--',
sys.executable, '-c', 'True')
