You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by sv...@mobsol.be on 2006/10/18 01:11:19 UTC

Re: svn commit: r22012 - trunk/subversion/tests/cmdline

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

Re: svn commit: r22012 - trunk/subversion/tests/cmdline

Posted by Daniel Rall <dl...@collab.net>.
On Wed, 18 Oct 2006, Lieven Govaerts wrote:

> Thanks, committed a slightly modified version in r22020.
> 
> Daniel, can you check if this change really solves your problem?

Yup, that takes care of it.  Thanks Lieven (and Kamesh)!

- Dan

Re: svn commit: r22012 - trunk/subversion/tests/cmdline

Posted by Lieven Govaerts <sv...@mobsol.be>.
Thanks, committed a slightly modified version in r22020.

Daniel, can you check if this change really solves your problem?

Lieven.

Kamesh Jayachandran wrote:
> Patch looks fine except for one small change.
> Expect the 'SVNAnyOutput' rather than 'xout'.
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r22012 - trunk/subversion/tests/cmdline

Posted by Kamesh Jayachandran <ka...@collab.net>.
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


Re: svn commit: r22012 - trunk/subversion/tests/cmdline

Posted by sv...@mobsol.be.
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.