Author: rhuijben
Date: Fri Jul 30 08:13:15 2010
New Revision: 980672
URL: http://svn.apache.org/viewvc?rev=980672&view=rev
Log:
Add regression test on the 'Pristine text not found' issue currently only
triggered by the ruby tests. This test is based on a reproduction script
in http://svn.haxx.se/dev/archive-2010-07/0690.shtml
Found by: joeswatosh
* subversion/tests/cmdline/basic_tests.py
(delete_and_add_same_file): New function
(test_list): Add delete_and_add_same_file as XFail.
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=980672&r1=980671&r2=980672&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Jul 30
08:13:15 2010
@@ -2520,6 +2520,36 @@ def meta_correct_library_being_used(sbox
svntest.actions.run_and_verify_svn("is $http_library available",
expected_output, [], '--version')
+def delete_and_add_same_file(sbox):
+ "delete and add the same file in one commit"
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+
+ iota = os.path.join(wc_dir, 'iota')
+ iota2 = os.path.join(wc_dir, 'iota2')
+
+ shutil.copyfile(iota, iota2)
+
+ svntest.main.run_svn(None, 'rm', iota)
+ svntest.main.run_svn(None, 'add', iota2)
+
+ expected_output = wc.State(wc_dir, {
+ 'iota' : Item(verb='Deleting'),
+ 'iota2' : Item(verb='Adding'),
+ })
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.remove('iota')
+ expected_status.add({ 'iota2': Item(status=' ', wc_rev='2')})
+
+ # Currently this commit fails with a
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None,
+ wc_dir)
+
#----------------------------------------------------------------------
########################################################################
@@ -2579,6 +2609,7 @@ test_list = [ None,
delete_from_url_with_spaces,
SkipUnless(meta_correct_library_being_used,
svntest.main.is_ra_type_dav),
+ XFail(delete_and_add_same_file),
]
if __name__ == '__main__':
