[PATCH] tests: stabilize svn output

[timeless]

My version didn't generate them, let's add egrep "." ...
On Mar 12, 2016 2:09 PM, "FUJIWARA Katsunori" <foozy at lares.dti.ne.jp> wrote:

> At Fri, 11 Mar 2016 09:44:16 -0600,
> timeless wrote:
> >
> > # HG changeset patch
> > # User timeless <timeless at mozdev.org>
> > # Date 1457675259 0
> > #      Fri Mar 11 05:47:39 2016 +0000
> > # Node ID 54f8ba4e4c0fbb65563778c8891278e4f84e5005
> > # Parent  1c658391b22fb4d98ccfb60c0e57315b55634117
> > tests: stabilize svn output
> >
> > With 1.9.3 extra bits were appearing...
>
> In my environment (using svn 1.6.x), this patch causes failure of
> test-convert-svn-source.t with errors below.
>
> AFAIK, these are corresponded to empty line output dropped in your
> patch. Would you drop them intentionally ? (or svn version depending
> behavior difference ?)
>
> --- /home/fujiwara/anyware/mercurial/repo/
> selenic.com/hg/tests/test-convert-svn-source.t
> +++ /home/fujiwara/anyware/mercurial/repo/
> selenic.com/hg/tests/test-convert-svn-source.t.err
> @@ -32,8 +32,9 @@
>    $ cd ..
>
>    $ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" |
> filter_svn_output | sort
> -  Adding         projB/mytrunk (glob)
> -  Adding         projB/tags (glob)
> +
> +  Adding         projB/mytrunk
> +  Adding         projB/tags
>    Committed revision 1.
>
>  Update svn repository
> @@ -56,6 +57,7 @@
>    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'
> @@ -99,6 +101,7 @@
>    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
>
> ERROR: test-convert-svn-source.t output changed
>
> (snip tests/test-convert-hg-svn.t)
>
> > 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
> > @@ -1,5 +1,9 @@
> >  #require svn svn-bindings
> >
> > +  $ filter_svn_output () {
> > +  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
> > +  > }
> > +
> >    $ cat >> $HGRCPATH <<EOF
> >    > [extensions]
> >    > convert =
> > @@ -27,37 +31,35 @@
> >    $ mkdir tags
> >    $ cd ..
> >
> > -  $ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" | sort
> > -
> > +  $ 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
> >
> > -  $ svn co "$SVNREPOURL/proj%20B/mytrunk" B
> > +  $ svn co "$SVNREPOURL/proj%20B/mytrunk" B | filter_svn_output
> >    Checked out revision 1.
> >    $ cd B
> >    $ echo hello > 'letter .txt'
> > -  $ svn add 'letter .txt'
> > +  $ svn add 'letter .txt' | filter_svn_output
> >    A         letter .txt
> > -  $ svn ci -m hello
> > +  $ svn ci -m hello | filter_svn_output
> >    Adding         letter .txt
> >    Transmitting file data .
> >    Committed revision 2.
> >
> >    $ svn-safe-append.py world 'letter .txt'
> > -  $ svn ci -m world
> > +  $ svn ci -m world | filter_svn_output
> >    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"
> > -
> > +  $ 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"
> > +  $ svn ci -m "nice day" | filter_svn_output
> >    Sending        letter .txt
> >    Transmitting file data .
> >    Committed revision 5.
> > @@ -88,20 +90,19 @@
> >    $ cd B
> >    $ svn-safe-append.py "see second letter" 'letter .txt'
> >    $ echo "nice to meet you" > letter2.txt
> > -  $ svn add letter2.txt
> > +  $ svn add letter2.txt | filter_svn_output
> >    A         letter2.txt
> > -  $ svn ci -m "second letter"
> > +  $ svn ci -m "second letter" | filter_svn_output
> >    Sending        letter .txt
> >    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"
> > -
> > +  $ 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"
> > +  $ svn ci -m "work in progress" | filter_svn_output
> >    Sending        letter2.txt
> >    Transmitting file data .
> >    Committed revision 8.
> > @@ -172,7 +173,7 @@
> >
> >    $ cd B
> >    $ echo >> "letter .txt"
> > -  $ svn ci -m 'nothing'
> > +  $ svn ci -m 'nothing' | filter_svn_output
> >    Sending        letter .txt
> >    Transmitting file data .
> >    Committed revision 9.
>
> ----------------------------------------------------------------------
> [FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160312/54b065e8/attachment-0001.html>