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 2013/01/21 21:43:38 UTC
svn commit: r1436605 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Mon Jan 21 20:43:38 2013
New Revision: 1436605
URL: http://svn.apache.org/viewvc?rev=1436605&view=rev
Log:
* subversion/tests/cmdline/patch_tests.py
(patch_change_symlink_target): Verify all commit output in an attempt to
diagnose an error on some systems.
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=1436605&r1=1436604&r2=1436605&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Mon Jan 21 20:43:38 2013
@@ -4230,24 +4230,37 @@ def patch_change_symlink_target(sbox):
# r2 - Try as plain text with how we encode the symlink
svntest.main.file_write(sbox.ospath('link'), 'link foo')
sbox.simple_add('link')
- sbox.simple_commit()
- expected_output = [
+ expected_output = svntest.wc.State(wc_dir, {
+ 'link' : Item(verb='Adding'),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ None, None, wc_dir)
+
+ patch_output = [
'U %s\n' % sbox.ospath('link'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(None, patch_output, [],
'patch', patch_file_path, wc_dir)
# r3 - Store result
- sbox.simple_commit()
+ expected_output = svntest.wc.State(wc_dir, {
+ 'link' : Item(verb='Sending'),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ None, None, wc_dir)
# r4 - Now as symlink
sbox.simple_rm('link')
sbox.simple_add_symlink('foo', 'link')
- sbox.simple_commit()
+ expected_output = svntest.wc.State(wc_dir, {
+ 'link' : Item(verb='Replacing'),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ None, None, wc_dir)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(None, patch_output, [],
'patch', patch_file_path, wc_dir)
# TODO: when it passes, verify that the on-disk 'link' is correct ---