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 2014/06/26 17:06:21 UTC
svn commit: r1605810 -
/subversion/trunk/subversion/tests/cmdline/diff_tests.py
Author: rhuijben
Date: Thu Jun 26 15:06:20 2014
New Revision: 1605810
URL: http://svn.apache.org/r1605810
Log:
Add new XFail regression test for a case where 'svn diff' triggers an
assertion.
Found by: stsp
* subversion/tests/cmdline/diff_tests.py
(diff_deleted_in_move_against_repos): New XFail test.
(test_list): Add diff_deleted_in_move_against_repos.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1605810&r1=1605809&r2=1605810&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Jun 26 15:06:20 2014
@@ -4728,6 +4728,31 @@ def diff_parent_dir(sbox):
finally:
os.chdir(was_cwd)
+@XFail()
+def diff_deleted_in_move_against_repos(sbox):
+ "diff deleted in move against repository"
+
+ sbox.build()
+ sbox.simple_move('A/B', 'BB')
+ sbox.simple_move('BB/E/alpha', 'BB/q')
+ sbox.simple_rm('BB/E/beta')
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', sbox.repo_url + '/BB/E',
+ '--parents', '-m', 'Create dir')
+
+ # OK. Local diff
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'diff', sbox.wc_dir)
+
+ # OK. Walks nodes locally from wc-root
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'diff', sbox.wc_dir, '-r1')
+
+ # Assertion. Walks nodes locally from BB.
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'diff', sbox.wc_dir, '-r2')
+
########################################################################
#Run the tests
@@ -4816,6 +4841,7 @@ test_list = [ None,
diff_repo_repo_added_file_mime_type,
diff_switched_file,
diff_parent_dir,
+ diff_deleted_in_move_against_repos,
]
if __name__ == '__main__':