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 2011/05/18 22:50:52 UTC
svn commit: r1124421 -
/subversion/trunk/subversion/tests/cmdline/prop_tests.py
Author: rhuijben
Date: Wed May 18 20:50:51 2011
New Revision: 1124421
URL: http://svn.apache.org/viewvc?rev=1124421&view=rev
Log:
* subversion/tests/cmdline/prop_tests.py
(recursive_base_wc_ops): Revert just the changes of this functions
applied in r1124399, r1104641 and 1104631. With the other fixes from
this range this part was not necessary and it seems to break the
test for cmpilato.
Modified:
subversion/trunk/subversion/tests/cmdline/prop_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1124421&r1=1124420&r2=1124421&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Wed May 18 20:50:51 2011
@@ -1081,42 +1081,30 @@ def recursive_base_wc_ops(sbox):
svntest.main.run_svn(None, 'del', '--force', fp_del)
# Test recursive proplist
- expected_output = svntest.verify.UnorderedRegexOutput([
- "Properties on '" + sbox.ospath('A/mu') + "':\n",
- " p\n",
- " old-del\n",
- "Properties on '" + sbox.ospath('iota') + "':\n",
- " p\n",
- " old-keep\n",
- ])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
- 'proplist', '-R', '-v', wc_dir, '-rBASE')
+ exit_code, output, errput = svntest.main.run_svn(None, 'proplist', '-R',
+ '-v', wc_dir, '-rBASE')
+ verify_output([ 'old-del', 'old-keep', 'p', 'p',
+ 'Properties on ', 'Properties on ' ],
+ output, errput)
+ svntest.verify.verify_exit_code(None, exit_code, 0)
- expected_output = svntest.verify.UnorderedRegexOutput([
- "Properties on '" + sbox.ospath('A/added') + "':\n",
- " p\n",
- " new-add\n",
- "Properties on '" + sbox.ospath('iota') + "':\n",
- " p\n",
- " new-keep\n",
- ])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
- 'proplist', '-R', '-v', wc_dir)
+ exit_code, output, errput = svntest.main.run_svn(None, 'proplist', '-R',
+ '-v', wc_dir)
+ verify_output([ 'new-add', 'new-keep', 'p', 'p',
+ 'Properties on ', 'Properties on ' ],
+ output, errput)
+ svntest.verify.verify_exit_code(None, exit_code, 0)
# Test recursive propget
- expected_output = svntest.verify.UnorderedRegexOutput([
- sbox.ospath('iota') + " - old-keep\n",
- sbox.ospath('A/mu') + " - old-del\n",
- ])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
- 'propget', 'p', '-R', wc_dir, '-rBASE')
+ exit_code, output, errput = svntest.main.run_svn(None, 'propget', '-R',
+ 'p', wc_dir, '-rBASE')
+ verify_output([ 'old-del', 'old-keep' ], output, errput)
+ svntest.verify.verify_exit_code(None, exit_code, 0)
- expected_output = svntest.verify.UnorderedRegexOutput([
- sbox.ospath('iota') + " - new-keep\n",
- sbox.ospath('A/added') + " - new-add\n",
- ])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
- 'propget', 'p', '-R', wc_dir)
+ exit_code, output, errput = svntest.main.run_svn(None, 'propget', '-R',
+ 'p', wc_dir)
+ verify_output([ 'new-add', 'new-keep' ], output, errput)
+ svntest.verify.verify_exit_code(None, exit_code, 0)
# Test recursive propset (issue 1794)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)