Fix Azure Pipelines for t0000 #732

dscho · 2020-03-19T21:29:02Z

When running t0000 in our Azure Pipeline, the "Publish Test Results" step complains about an invalid JUnit-style XML, and it is correct. Let's fix that.

When a test case is run in a subshell, we finalize the JUnit-style XML when said subshell exits. But then we continue to write into that XML as if nothing had happened. This leads to Azure Pipelines' Publish Test Results task complaining: Failed to read /home/vsts/work/1/s/t/out/TEST-t0000-basic.xml. Error : Unexpected end tag. Line 110, position 5. And indeed, the resulting XML is incorrect. Let's "re-open" the XML in such a case, i.e. remove the previously added closing tags. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho · 2020-03-23T12:43:31Z

/submit

gitgitgadget-git · 2020-03-23T12:44:46Z

Submitted as pull.732.git.git.1584967475669.gitgitgadget@gmail.com

gitgitgadget-git · 2020-03-23T16:29:02Z

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> When a test case is run in a subshell, we finalize the JUnit-style XML
> when said subshell exits. But then we continue to write into that XML as
> if nothing had happened.
>
> This leads to Azure Pipelines' Publish Test Results task complaining:
>
> 	Failed to read /home/vsts/work/1/s/t/out/TEST-t0000-basic.xml.
> 	Error : Unexpected end tag. Line 110, position 5.
>
> And indeed, the resulting XML is incorrect.
>
> Let's "re-open" the XML in such a case, i.e. remove the previously added
> closing tags.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     Fix Azure Pipelines for t0000
>     
>     When running t0000 in our Azure Pipeline, the "Publish Test Results"
>     step complains about an invalid JUnit-style XML, and it is correct.
>     Let's fix that.

Hmph, I have a vague recollection that I've seen this one, looked at
the patch and even understood the issue.  Did I then forget to apply
it back then?  If so, apologies for failing to do so before the
release.

Will queue.

Thanks.

> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-732%2Fdscho%2Fci-xml-error-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-732/dscho/ci-xml-error-v1
> Pull-Request: https://github.com/git/git/pull/732
>
>  t/test-lib.sh | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 0ea1e5a05ed..7f0c02c016b 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1085,6 +1085,7 @@ finalize_junit_xml () {
>  		junit_time=$(test-tool date getnanos $junit_suite_start)
>  		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
>  			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
> +			-e '/^ *<\/testsuite/d' \
>  			<"$junit_xml_path" >"$junit_xml_path.new"
>  		mv "$junit_xml_path.new" "$junit_xml_path"
>  
>
> base-commit: be8661a3286c67a5d4088f4226cbd7f8b76544b0

gitgitgadget-git · 2020-03-23T20:59:49Z

On the Git mailing list, Johannes Schindelin wrote (reply to this):

Hi Junio,

On Mon, 23 Mar 2020, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > When a test case is run in a subshell, we finalize the JUnit-style XML
> > when said subshell exits. But then we continue to write into that XML as
> > if nothing had happened.
> >
> > This leads to Azure Pipelines' Publish Test Results task complaining:
> >
> > 	Failed to read /home/vsts/work/1/s/t/out/TEST-t0000-basic.xml.
> > 	Error : Unexpected end tag. Line 110, position 5.
> >
> > And indeed, the resulting XML is incorrect.
> >
> > Let's "re-open" the XML in such a case, i.e. remove the previously added
> > closing tags.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >     Fix Azure Pipelines for t0000
> >
> >     When running t0000 in our Azure Pipeline, the "Publish Test Results"
> >     step complains about an invalid JUnit-style XML, and it is correct.
> >     Let's fix that.
>
> Hmph, I have a vague recollection that I've seen this one, looked at
> the patch and even understood the issue.  Did I then forget to apply
> it back then?  If so, apologies for failing to do so before the
> release.

I suspect that you think of 076ee3e8a2a6 (tests: fix --write-junit-xml
with subshells, 2020-02-12) which you indeed applied. This patch addresses
a different issue that I had not noticed until two weeks ago. I
purposefully held back on contributing it during the feature freeze phase.

> Will queue.

Thanks,
Dscho

>
> Thanks.
>
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-732%2Fdscho%2Fci-xml-error-v1
> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-732/dscho/ci-xml-error-v1
> > Pull-Request: https://github.com/git/git/pull/732
> >
> >  t/test-lib.sh | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index 0ea1e5a05ed..7f0c02c016b 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> > @@ -1085,6 +1085,7 @@ finalize_junit_xml () {
> >  		junit_time=$(test-tool date getnanos $junit_suite_start)
> >  		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
> >  			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
> > +			-e '/^ *<\/testsuite/d' \
> >  			<"$junit_xml_path" >"$junit_xml_path.new"
> >  		mv "$junit_xml_path.new" "$junit_xml_path"
> >
> >
> > base-commit: be8661a3286c67a5d4088f4226cbd7f8b76544b0
>
>

gitgitgadget-git · 2020-03-23T22:08:17Z

This patch series was integrated into pu via 31b7fed.

gitgitgadget-git · 2020-03-25T00:09:20Z

This branch is now known as js/test-junit-finalization-fix.

gitgitgadget-git · 2020-03-25T00:09:21Z

This patch series was integrated into pu via d49787e.

gitgitgadget-git · 2020-03-25T16:50:08Z

This patch series was integrated into pu via c56e86f.

gitgitgadget-git · 2020-03-25T19:21:30Z

This patch series was integrated into pu via 33a3a7c.

gitgitgadget-git · 2020-03-25T22:00:16Z

This patch series was integrated into pu via 009b1d1.

gitgitgadget-git · 2020-03-27T01:32:38Z

This patch series was integrated into pu via 34a4796.

gitgitgadget-git · 2020-03-29T19:37:13Z

This patch series was integrated into pu via 954c680.

gitgitgadget-git · 2020-03-31T22:49:06Z

This patch series was integrated into pu via 2c7b568.

gitgitgadget-git · 2020-04-14T18:27:49Z

This patch series was integrated into pu via d2b86f7.

gitgitgadget-git · 2020-04-15T20:03:09Z

This patch series was integrated into pu via 87cd9d7.

gitgitgadget-git · 2020-04-15T23:21:47Z

This patch series was integrated into pu via 7ea517b.

gitgitgadget-git · 2020-04-15T23:21:48Z

This patch series was integrated into next via 0d6a975.

gitgitgadget-git · 2020-04-20T18:33:17Z

This patch series was integrated into pu via eace8b9.

gitgitgadget-git · 2020-04-21T02:21:03Z

This patch series was integrated into pu via 129edc2.

gitgitgadget-git · 2020-04-24T23:48:47Z

This patch series was integrated into pu via d72fa76.

gitgitgadget-git · 2020-04-24T23:48:49Z

This patch series was integrated into next via d72fa76.

gitgitgadget-git · 2020-04-24T23:48:50Z

This patch series was integrated into master via d72fa76.

gitgitgadget-git · 2020-04-24T23:48:53Z

Closed via d72fa76.

Currently when the `core.gvfs` setting is set, several commands are outright blocked from running. Some of these commands, namely `repack` are actually OK to run in a Scalar clone, even if it uses the GVFS protocol (for Azure DevOps). Introduce a different blocking mechanism to only block commands when the virtual filesystem is being used, rather than as a broad block on any `core.gvfs` setting.

gitgitgadget-git bot added the pu label Mar 23, 2020

gitgitgadget-git bot added the next label Apr 15, 2020

gitgitgadget-git bot added the master label Apr 24, 2020

gitgitgadget-git bot closed this Apr 24, 2020

dscho deleted the ci-xml-error branch April 25, 2020 20:13

Fix Azure Pipelines for t0000 #732

Fix Azure Pipelines for t0000 #732

Uh oh!

Conversation

dscho commented Mar 19, 2020

Uh oh!

dscho commented Mar 23, 2020

Uh oh!

gitgitgadget-git bot commented Mar 23, 2020

Uh oh!

gitgitgadget-git bot commented Mar 23, 2020

Uh oh!

gitgitgadget-git bot commented Mar 23, 2020

Uh oh!

gitgitgadget-git bot commented Mar 23, 2020

Uh oh!

gitgitgadget-git bot commented Mar 25, 2020

Uh oh!

gitgitgadget-git bot commented Mar 25, 2020

Uh oh!

gitgitgadget-git bot commented Mar 25, 2020

Uh oh!

gitgitgadget-git bot commented Mar 25, 2020

Uh oh!

gitgitgadget-git bot commented Mar 25, 2020

Uh oh!

gitgitgadget-git bot commented Mar 27, 2020

Uh oh!

gitgitgadget-git bot commented Mar 29, 2020

Uh oh!

gitgitgadget-git bot commented Mar 31, 2020

Uh oh!

gitgitgadget-git bot commented Apr 14, 2020

Uh oh!

gitgitgadget-git bot commented Apr 15, 2020

Uh oh!

gitgitgadget-git bot commented Apr 15, 2020

Uh oh!

gitgitgadget-git bot commented Apr 15, 2020

Uh oh!

gitgitgadget-git bot commented Apr 20, 2020

Uh oh!

gitgitgadget-git bot commented Apr 21, 2020

Uh oh!

gitgitgadget-git bot commented Apr 24, 2020

Uh oh!

gitgitgadget-git bot commented Apr 24, 2020

Uh oh!

gitgitgadget-git bot commented Apr 24, 2020

Uh oh!

gitgitgadget-git bot commented Apr 24, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant