Author: cmpilato
Date: Wed May 18 19:56:47 2011
New Revision: 1124399
URL: http://svn.apache.org/viewvc?rev=1124399&view=rev
Log:
Fix a failing (for me, at least) test.
* subversion/tests/cmdline/prop_tests.py
(recursive_base_wc_ops): Be more flexible about proplist and propget
output ordering.
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=1124399&r1=1124398&r2=1124399&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Wed May 18 19:56:47
2011
@@ -1081,40 +1081,40 @@ def recursive_base_wc_ops(sbox):
svntest.main.run_svn(None, 'del', '--force', fp_del)
# Test recursive proplist
- expected_output = [
+ 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"
- ]
+ " old-keep\n",
+ ])
svntest.actions.run_and_verify_svn(None, expected_output, [],
'proplist', '-R', '-v', wc_dir, '-rBASE')
- expected_output = [
+ 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"
- ]
+ " new-keep\n",
+ ])
svntest.actions.run_and_verify_svn(None, expected_output, [],
'proplist', '-R', '-v', wc_dir)
# Test recursive propget
- expected_output = [
+ 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')
- expected_output = [
+ 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)
