You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/10/02 15:15:43 UTC
svn commit: r1706401 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Fri Oct 2 13:15:43 2015
New Revision: 1706401
URL: http://svn.apache.org/viewvc?rev=1706401&view=rev
Log:
* subversion/tests/cmdline/patch_tests.py
(patch_add_symlink): Tweak test to also work on platforms that don't support
symlinks. Extend test.
Modified:
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1706401&r1=1706400&r2=1706401&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Fri Oct 2 13:15:43 2015
@@ -3416,7 +3416,6 @@ def patch_set_prop_no_eol(sbox):
return patch_one_property(sbox, False)
# Regression test for issue #3697
-@SkipUnless(svntest.main.is_posix_os)
@Issue(3697)
def patch_add_symlink(sbox):
"patch that adds a symlink"
@@ -3446,13 +3445,15 @@ def patch_add_symlink(sbox):
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [
- 'A %s\n' % sbox.ospath('iota_symlink'),
- ]
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota_symlink' : Item(status='A ')
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({'iota_symlink': Item(contents="This is the file 'iota'.\n",
props={'svn:special' : '*'})})
+ if not svntest.main.is_posix_os():
+ expected_disk.tweak('iota_symlink', contents='link iota\n')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'iota_symlink': Item(status='A ', wc_rev='0')})
@@ -3463,9 +3464,38 @@ def patch_add_symlink(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output.tweak('iota_symlink', status='D ')
+ expected_disk.remove('iota_symlink')
+ expected_status.remove('iota_symlink')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
def patch_moved_away(sbox):
"patch a file that was moved away"