[PATCH] tests: make tests for convert with svn portable

[Augie Fackler]

On Tue, Mar 15, 2016 at 12:19:52AM +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1457968493 -32400
> #      Tue Mar 15 00:14:53 2016 +0900
> # Node ID 732e217dd9483282e173d9afbb9cd65e19262629
> # Parent  859af6e78368600f724ccc26397ec30b145bffdb
> tests: make tests for convert with svn portable

Queued this, thanks!

>
> svn 1.6.x (at least, 1.6.12 or 1.6.17) might display empty lines, even
> though svn 1.9.x (at least, 1.9.3) doesn't.
>
> To make tests for convert with svn portable, this patch adds "|(^$)"
> regexp to egrep in filter_svn_output.
>
> To avoid similar future issue, this patch adds "|(^$)" regexp to all
> filter_svn_output (and adjusts test-subrepo-svn.t), even though only
> test-convert-svn-source.t fails with svn 1.6.x, AFAIK.
>
> diff --git a/tests/test-convert-hg-svn.t b/tests/test-convert-hg-svn.t
> --- a/tests/test-convert-hg-svn.t
> +++ b/tests/test-convert-hg-svn.t
> @@ -1,7 +1,7 @@
>  #require svn svn-bindings
>
>    $ filter_svn_output () {
> -  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
> +  >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
>    > }
>
>    $ cat <<EOF >> $HGRCPATH
> 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,7 +1,7 @@
>  #require svn svn-bindings
>
>    $ filter_svn_output () {
> -  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
> +  >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
>    > }
>
>    $ cat >> $HGRCPATH <<EOF
> diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
> --- a/tests/test-subrepo-svn.t
> +++ b/tests/test-subrepo-svn.t
> @@ -8,7 +8,7 @@
>  #endif
>
>    $ filter_svn_output () {
> -  >     egrep -v 'Committing|Transmitting|Updating' || true
> +  >     egrep -v 'Committing|Transmitting|Updating|(^$)' || true
>    > }
>
>  create subversion repo
> @@ -97,10 +97,8 @@ change file in svn and hg, commit
>    committing subrepository s
>    Sending*s/alpha (glob)
>    Committed revision 3.
> -
>    Fetching external item into '*s/externals'* (glob)
>    External at revision 1.
> -
>    At revision 3.
>    $ hg debugsub
>    path s
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel