You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/09/02 15:55:26 UTC
svn commit: r1164535 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: cmpilato
Date: Fri Sep 2 13:55:26 2011
New Revision: 1164535
URL: http://svn.apache.org/viewvc?rev=1164535&view=rev
Log:
Add a pair of XFail-ing regression tests for issue #4004.
* subversion/tests/cmdline/patch_tests.py
(patch_reversed_add_with_props,
patch_reversed_add_with_props2): New test functions, XFail.
(test_list): Add references to new tests.
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=1164535&r1=1164534&r2=1164535&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Fri Sep 2 13:55:26 2011
@@ -3755,6 +3755,112 @@ def patch_deletes_prop(sbox):
0, # dry-run
'--reverse-diff')
+@XFail()
+@Issue(4004)
+def patch_reversed_add_with_props(sbox):
+ "reverse patch new file+props atop uncommitted"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ patch_file_path = make_patch_path(sbox)
+
+ # Add a new file which also has props set on it.
+ newfile_path = os.path.join(wc_dir, 'newfile')
+ newfile_contents = ["This is the file 'newfile'.\n"]
+ svntest.main.file_write(newfile_path, ''.join(newfile_contents))
+ svntest.main.run_svn(None, 'add', newfile_path)
+ svntest.main.run_svn(None, 'propset', 'propname', 'propvalue',
+ newfile_path)
+
+ # Generate a patch file from our current diff (rooted at the working
+ # copy root).
+ cwd = os.getcwd()
+ try:
+ os.chdir(wc_dir)
+ exit_code, diff_output, err_output = svntest.main.run_svn(None, 'diff')
+ finally:
+ os.chdir(cwd)
+ svntest.main.file_write(patch_file_path, ''.join(diff_output))
+
+ # Okay, now commit up.
+ expected_output = svntest.wc.State(wc_dir, {
+ 'newfile' : Item(verb='Adding'),
+ })
+
+ # Now, we'll try to reverse-apply the very diff we just created. We
+ # expect the original state of the working copy in r1.
+ expected_disk = svntest.main.greek_state.copy()
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_skip = wc.State('', { })
+ expected_output = [
+ 'D %s\n' % newfile_path,
+ ]
+ svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, # expected err
+ 1, # check-props
+ 0, # dry-run
+ '--reverse-diff')
+
+@XFail()
+@Issue(4004)
+def patch_reversed_add_with_props2(sbox):
+ "reverse patch new file+props"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ patch_file_path = make_patch_path(sbox)
+
+ # Add a new file which also has props set on it.
+ newfile_path = os.path.join(wc_dir, 'newfile')
+ newfile_contents = ["This is the file 'newfile'.\n"]
+ svntest.main.file_write(newfile_path, ''.join(newfile_contents))
+ svntest.main.run_svn(None, 'add', newfile_path)
+ svntest.main.run_svn(None, 'propset', 'propname', 'propvalue',
+ newfile_path)
+
+ # Generate a patch file from our current diff (rooted at the working
+ # copy root).
+ cwd = os.getcwd()
+ try:
+ os.chdir(wc_dir)
+ exit_code, diff_output, err_output = svntest.main.run_svn(None, 'diff')
+ finally:
+ os.chdir(cwd)
+ svntest.main.file_write(patch_file_path, ''.join(diff_output))
+
+ # Okay, now commit up.
+ expected_output = svntest.wc.State(wc_dir, {
+ 'newfile' : Item(verb='Adding'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({'newfile' : Item(wc_rev=2, status=' ')})
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status, None, wc_dir)
+
+ # Now, we'll try to reverse-apply the very diff we just created. We
+ # expect the original state of the working copy in r1 plus 'newfile'
+ # scheduled for deletion.
+ expected_disk = svntest.main.greek_state.copy()
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({'newfile' : Item(status='D ', wc_rev=2)})
+ expected_skip = wc.State('', { })
+ expected_output = [
+ 'D %s\n' % newfile_path,
+ ]
+ svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, # expected err
+ 1, # check-props
+ 0, # dry-run
+ '--reverse-diff')
+
########################################################################
#Run the tests
@@ -3793,6 +3899,8 @@ test_list = [ None,
patch_moved_away,
patch_lacking_trailing_eol,
patch_deletes_prop,
+ patch_reversed_add_with_props,
+ patch_reversed_add_with_props2,
]
if __name__ == '__main__':