Author: rhuijben
Date: Thu May 19 23:47:27 2011
New Revision: 1125182
URL: http://svn.apache.org/viewvc?rev=1125182&view=rev
Log:
* subversion/tests/cmdline/special_tests.py
(replace_symlink_with_dir): Following up on r1125177, an attempt to fix this
test on systems that do support symlinks.
Modified:
subversion/trunk/subversion/tests/cmdline/special_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1125182&r1=1125181&r2=1125182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Thu May 19
23:47:27 2011
@@ -605,8 +605,13 @@ def replace_symlink_with_dir(sbox):
os.chdir(was_cwd)
expected_output = svntest.wc.State(wc_dir, {
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+
+ if svntest.main.is_posix_os():
+ error_re_string = '.*E145001: Entry.*has unexpectedly changed special.*'
+ else:
+ error_re_string = None
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ None, error_re_string, wc_dir)
# test for issue #1808: svn up deletes local symlink that obstructs
# versioned file
