You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/02/11 13:59:41 UTC
svn commit: r1069789 -
/subversion/trunk/subversion/tests/cmdline/revert_tests.py
Author: philip
Date: Fri Feb 11 12:59:41 2011
New Revision: 1069789
URL: http://svn.apache.org/viewvc?rev=1069789&view=rev
Log:
* subversion/tests/cmdline/revert_tests.py
(revert_non_recusive_after_delete): New test for issue 3783.
(test_list): Mark test XFail.
Modified:
subversion/trunk/subversion/tests/cmdline/revert_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1069789&r1=1069788&r2=1069789&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Feb 11 12:59:41 2011
@@ -1041,6 +1041,38 @@ def revert_child_of_copy(sbox):
'revert', sbox.ospath('A/B/E2/beta'))
svntest.actions.run_and_verify_status(wc_dir, expected_status)
+@XFail()
+@Issue(3783)
+def revert_non_recusive_after_delete(sbox):
+ "non-recursive revert after delete"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/B'))
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F',
+ 'A/B/lambda', status='D ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # This appears to work but gets the op-depth wrong
+ expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B')]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'revert', sbox.ospath('A/B'))
+ expected_status.tweak('A/B', status=' ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', sbox.ospath('A/B/E'))
+ expected_status.tweak('A/B/E', status='R ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Since the op-depth was wrong A/B/E erroneously remains deleted
+ expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E')]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'revert', sbox.ospath('A/B/E'))
+ expected_status.tweak('A/B/E', status=' ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
########################################################################
# Run the tests
@@ -1070,6 +1102,7 @@ test_list = [ None,
revert_add_over_not_present_dir,
revert_added_tree,
revert_child_of_copy,
+ revert_non_recusive_after_delete,
]
if __name__ == '__main__':
Re: svn commit: r1069789 -
/subversion/trunk/subversion/tests/cmdline/revert_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
philip@apache.org wrote on Fri, Feb 11, 2011 at 12:59:41 -0000:
> Author: philip
> Date: Fri Feb 11 12:59:41 2011
> New Revision: 1069789
>
> URL: http://svn.apache.org/viewvc?rev=1069789&view=rev
> Log:
> * subversion/tests/cmdline/revert_tests.py
> (revert_non_recusive_after_delete): New test for issue 3783.
> (test_list): Mark test XFail.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/revert_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1069789&r1=1069788&r2=1069789&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Feb 11 12:59:41 2011
> @@ -1041,6 +1041,38 @@ def revert_child_of_copy(sbox):
> 'revert', sbox.ospath('A/B/E2/beta'))
> svntest.actions.run_and_verify_status(wc_dir, expected_status)
>
> +@XFail()
> +@Issue(3783)
> +def revert_non_recusive_after_delete(sbox):
> + "non-recursive revert after delete"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
> +
Can pass read_only=True to sbox.build() ?
> + svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/B'))
> + expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> + expected_status.tweak('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F',
> + 'A/B/lambda', status='D ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # This appears to work but gets the op-depth wrong
> + expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B')]
> + svntest.actions.run_and_verify_svn(None, expected_output, [],
> + 'revert', sbox.ospath('A/B'))
> + expected_status.tweak('A/B', status=' ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + svntest.actions.run_and_verify_svn(None, None, [],
> + 'mkdir', sbox.ospath('A/B/E'))
> + expected_status.tweak('A/B/E', status='R ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # Since the op-depth was wrong A/B/E erroneously remains deleted
> + expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E')]
> + svntest.actions.run_and_verify_svn(None, expected_output, [],
> + 'revert', sbox.ospath('A/B/E'))
> + expected_status.tweak('A/B/E', status=' ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
>
> ########################################################################
> # Run the tests
> @@ -1070,6 +1102,7 @@ test_list = [ None,
> revert_add_over_not_present_dir,
> revert_added_tree,
> revert_child_of_copy,
> + revert_non_recusive_after_delete,
> ]
>
> if __name__ == '__main__':
>
>
Re: svn commit: r1069789 -
/subversion/trunk/subversion/tests/cmdline/revert_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
philip@apache.org wrote on Fri, Feb 11, 2011 at 12:59:41 -0000:
> Author: philip
> Date: Fri Feb 11 12:59:41 2011
> New Revision: 1069789
>
> URL: http://svn.apache.org/viewvc?rev=1069789&view=rev
> Log:
> * subversion/tests/cmdline/revert_tests.py
> (revert_non_recusive_after_delete): New test for issue 3783.
> (test_list): Mark test XFail.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/revert_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1069789&r1=1069788&r2=1069789&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Feb 11 12:59:41 2011
> @@ -1041,6 +1041,38 @@ def revert_child_of_copy(sbox):
> 'revert', sbox.ospath('A/B/E2/beta'))
> svntest.actions.run_and_verify_status(wc_dir, expected_status)
>
> +@XFail()
> +@Issue(3783)
> +def revert_non_recusive_after_delete(sbox):
> + "non-recursive revert after delete"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
> +
Can pass read_only=True to sbox.build() ?
> + svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/B'))
> + expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> + expected_status.tweak('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F',
> + 'A/B/lambda', status='D ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # This appears to work but gets the op-depth wrong
> + expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B')]
> + svntest.actions.run_and_verify_svn(None, expected_output, [],
> + 'revert', sbox.ospath('A/B'))
> + expected_status.tweak('A/B', status=' ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + svntest.actions.run_and_verify_svn(None, None, [],
> + 'mkdir', sbox.ospath('A/B/E'))
> + expected_status.tweak('A/B/E', status='R ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # Since the op-depth was wrong A/B/E erroneously remains deleted
> + expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E')]
> + svntest.actions.run_and_verify_svn(None, expected_output, [],
> + 'revert', sbox.ospath('A/B/E'))
> + expected_status.tweak('A/B/E', status=' ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
>
> ########################################################################
> # Run the tests
> @@ -1070,6 +1102,7 @@ test_list = [ None,
> revert_add_over_not_present_dir,
> revert_added_tree,
> revert_child_of_copy,
> + revert_non_recusive_after_delete,
> ]
>
> if __name__ == '__main__':
>
>