Patchwork tests: add some optional line for svn test

login
register
mail settings
Submitter Pierre-Yves David
Date March 14, 2016, 1:51 p.m.
Message ID <6d73c87015235ceaec6f.1457963469@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/13866/
State Deferred
Headers show

Comments

Pierre-Yves David - March 14, 2016, 1:51 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1457962602 0
#      Mon Mar 14 13:36:42 2016 +0000
# Node ID 6d73c87015235ceaec6f01929e977f48869376f6
# Parent  ade330deb39a4d2b0bfe044196c87fc4c5fd69b2
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r 6d73c8701523
tests: add some optional line for svn test

Subversion have subtle different output from one version to another.
Pierre-Yves David - March 14, 2016, 2:22 p.m.
On 03/14/2016 02:18 PM, Ryan McElroy wrote:
> On 3/14/2016 1:51 PM, Pierre-Yves David wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david@fb.com>
>> # Date 1457962602 0
>> #      Mon Mar 14 13:36:42 2016 +0000
>> # Node ID 6d73c87015235ceaec6f01929e977f48869376f6
>> # Parent  ade330deb39a4d2b0bfe044196c87fc4c5fd69b2
>> # Available At
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__hg.netv6.net_marmoute-2Dwip_mercurial_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=fu2Yer-MrwLtgmKW1PZ8tw9lgekToU8p1aES1IYayhc&s=CZ73ZC4SpotONUIM9CIGD-JTJwoRmw74KwwHDLV8v2M&e=
>>
>> #              hg pull
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__hg.netv6.net_marmoute-2Dwip_mercurial_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=fu2Yer-MrwLtgmKW1PZ8tw9lgekToU8p1aES1IYayhc&s=CZ73ZC4SpotONUIM9CIGD-JTJwoRmw74KwwHDLV8v2M&e=
>> -r 6d73c8701523
>> tests: add some optional line for svn test
>>
>> Subversion have subtle different output from one version to another.
>
> Does the output actually include "(?)", or is this an empty line that
> may or may not be present? (Sorry I'm kind of a test n00b)

This is an optional empty line

> What versions of svn have this output? Might be worth pointing that out
> in the commit message.

I'm not the one with a failing version. Jun what version of Mercurial do 
you use?
Jun Wu - March 14, 2016, 2:42 p.m.
On 03/14/2016 02:22 PM, Pierre-Yves David wrote:
> I'm not the one with a failing version. Jun what version of Mercurial do you use?

ade330 from clowncopter.
svn version 1.7.14 (r1542130)
Katsunori FUJIWARA - March 14, 2016, 3:39 p.m.
At Mon, 14 Mar 2016 14:22:15 +0000,
Pierre-Yves David wrote:
> 
> On 03/14/2016 02:18 PM, Ryan McElroy wrote:
> > On 3/14/2016 1:51 PM, Pierre-Yves David wrote:
> >> # HG changeset patch
> >> # User Pierre-Yves David <pierre-yves.david@fb.com>
> >> # Date 1457962602 0
> >> #      Mon Mar 14 13:36:42 2016 +0000
> >> # Node ID 6d73c87015235ceaec6f01929e977f48869376f6
> >> # Parent  ade330deb39a4d2b0bfe044196c87fc4c5fd69b2
> >> # Available At
> >> https://urldefense.proofpoint.com/v2/url?u=http-3A__hg.netv6.net_marmoute-2Dwip_mercurial_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=fu2Yer-MrwLtgmKW1PZ8tw9lgekToU8p1aES1IYayhc&s=CZ73ZC4SpotONUIM9CIGD-JTJwoRmw74KwwHDLV8v2M&e=
> >>
> >> #              hg pull
> >> https://urldefense.proofpoint.com/v2/url?u=http-3A__hg.netv6.net_marmoute-2Dwip_mercurial_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=fu2Yer-MrwLtgmKW1PZ8tw9lgekToU8p1aES1IYayhc&s=CZ73ZC4SpotONUIM9CIGD-JTJwoRmw74KwwHDLV8v2M&e=
> >> -r 6d73c8701523
> >> tests: add some optional line for svn test
> >>
> >> Subversion have subtle different output from one version to another.
> >
> > Does the output actually include "(?)", or is this an empty line that
> > may or may not be present? (Sorry I'm kind of a test n00b)
> 
> This is an optional empty line
> 
> > What versions of svn have this output? Might be worth pointing that out
> > in the commit message.
> 
> I'm not the one with a failing version. Jun what version of Mercurial do 
> you use?

Oh, I just posted another version of fixing this issue :-)

Please use svn version, which causes failure of test, in that patch,
if needed.

> -- 
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

----------------------------------------------------------------------
[FUJIWARA Katsunori]                             foozy@lares.dti.ne.jp

Patch

diff --git a/tests/test-convert-svn-source.t b/tests/test-convert-svn-source.t
--- a/tests/test-convert-svn-source.t
+++ b/tests/test-convert-svn-source.t
@@ -30,10 +30,11 @@  Initial svn import
   $ mkdir mytrunk
   $ mkdir tags
   $ cd ..
 
   $ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" | filter_svn_output | sort
+   (?)
   Adding         projB/mytrunk (glob)
   Adding         projB/tags (glob)
   Committed revision 1.
 
 Update svn repository
@@ -54,10 +55,11 @@  Update svn repository
   Sending        letter .txt
   Transmitting file data .
   Committed revision 3.
 
   $ svn copy -m "tag v0.1" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.1" | filter_svn_output
+   (?)
   Committed revision 4.
 
   $ svn-safe-append.py 'nice day today!' 'letter .txt'
   $ svn ci -m "nice day" | filter_svn_output
   Sending        letter .txt
@@ -97,10 +99,11 @@  Update svn repository again
   Adding         letter2.txt
   Transmitting file data ..
   Committed revision 6.
 
   $ svn copy -m "tag v0.2" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.2" | filter_svn_output
+   (?)
   Committed revision 7.
 
   $ svn-safe-append.py "blah-blah-blah" letter2.txt
   $ svn ci -m "work in progress" | filter_svn_output
   Sending        letter2.txt