Patch looks fine except for one small change.
Expect the 'SVNAnyOutput' rather than 'xout'.
Attaching the new patch and log.
With regards
Kamesh Jayachandran
svnlgo@mobsol.be wrote:
> The patch was blocked by my personal stupidity firewall ;)
>
> Lieven.
>
> Quoting svnlgo@mobsol.be:
>
>
>> Can you test the attached patch with bdb to see if it fixes the problem?
>>
>> thanks,
>>
>> Lieven
>>
>> Quoting dlr@tigris.org:
>>
>>
>>> Author: dlr
>>> Date: Tue Oct 17 17:24:39 2006
>>> New Revision: 22012
>>>
>>> Log:
>>> * subversion/tests/cmdline/stat_tests.py
>>> (status_dash_u_missing_dir): Add FIXME note about this test case
>>> breaking with --fs-type=bdb due to output ordering differences.
>>>
>>>
>>> Modified:
>>> trunk/subversion/tests/cmdline/stat_tests.py
>>>
>>> Modified: trunk/subversion/tests/cmdline/stat_tests.py
>>> URL:
>>>
>>>
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/stat_tests.py?pathrev=22012&r1=22011&r2=22012
>
>> ==============================================================================
>>
>>> --- trunk/subversion/tests/cmdline/stat_tests.py (original)
>>> +++ trunk/subversion/tests/cmdline/stat_tests.py Tue Oct 17 17:24:39 2006
>>> @@ -918,6 +918,9 @@
>>> "Status against revision: 1\n" ]
>>>
>>> # now run status -u, we should be able to do this without crashing
>>> + ### FIXME: This test currently fails with --fs-type=bdb. Use of
>>> + ### svntest.main.compare_unordered_output() (or equivalent) should
>>> + ### fix this.
>>> svntest.actions.run_and_verify_svn(None,
>>> xout,
>>> [],
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
>>> For additional commands, e-mail: svn-help@subversion.tigris.org
>>>
>>>
>>>
>>
>>
>> ----------------------------------------------------------------
>> This message was sent using IMP, the Internet Messaging Program.
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>>
>>
>>
>
>
>
>
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.
>
> ------------------------------------------------------------------------
>
> Index: subversion/tests/cmdline/stat_tests.py
> ===================================================================
> --- subversion/tests/cmdline/stat_tests.py (revision 22013)
> +++ subversion/tests/cmdline/stat_tests.py (working copy)
> @@ -918,14 +918,13 @@
> "Status against revision: 1\n" ]
>
> # now run status -u, we should be able to do this without crashing
> - ### FIXME: This test currently fails on some platforms with
> - ### --fs-type=bdb. Use of svntest.main.compare_unordered_output()
> - ### (or equivalent) should fix this.
> - svntest.actions.run_and_verify_svn(None,
> - xout,
> - [],
> - "status", "-u", wc_dir)
> + output, errput = svntest.actions.run_and_verify_svn(None,
> + xout,
> + [],
> + "status", "-u", wc_dir)
>
> + svntest.main.compare_unordered_output(xout, output)
> +
> def status_add_plus_conflict(sbox):
> "status on conflicted added file"
> sbox.build()
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
[[[
'svn status -u's output is unordered so compare the output accordingly
with the expected output.
* subversion/tests/cmdline/stat_tests.py
(global):
import SVNAnyOutput.
(status_dash_u_missing_dir):
Check for the expected output outside run_and_verify_svn
using svntest.main.compare_unordered_output.
Patch by: Lieven Govaerts <lgo@mobsol.be>
Reviewed by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/tests/cmdline/stat_tests.py
===================================================================
--- subversion/tests/cmdline/stat_tests.py (revision 22014)
+++ subversion/tests/cmdline/stat_tests.py (working copy)
@@ -22,6 +22,7 @@
# Our testing module
import svntest
from svntest import wc
+from svntest import SVNAnyOutput
# (abbreviation)
@@ -918,14 +919,13 @@
"Status against revision: 1\n" ]
# now run status -u, we should be able to do this without crashing
- ### FIXME: This test currently fails on some platforms with
- ### --fs-type=bdb. Use of svntest.main.compare_unordered_output()
- ### (or equivalent) should fix this.
- svntest.actions.run_and_verify_svn(None,
- xout,
- [],
- "status", "-u", wc_dir)
+ output, errput = svntest.actions.run_and_verify_svn(None,
+ SVNAnyOutput,
+ [],
+ "status", "-u", wc_dir)
+ svntest.main.compare_unordered_output(xout, output)
+
def status_add_plus_conflict(sbox):
"status on conflicted added file"
sbox.build()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 18 08:30:17 2006