Work around t5799 failure with curl v8.16.0 - #801
Merged
Johannes Schindelin (dscho) merged 3 commits intoSep 30, 2025
Merged
Johannes Schindelin (dscho) merged 3 commits into
Johannes Schindelin (dscho) merged 3 commits into
Conversation
It's better not to hide the lines that are `grep`ed for. Makes debugging unnecessarily hard. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Johannes Schindelin (dscho)
requested a review
from Matthew John Cheetham (mjcheetham)
September 29, 2025 15:44
Merged
Johannes Schindelin (dscho)
force-pushed
the
work-around-t5799-failure-with-curl-v8.16.0
branch
from
September 29, 2025 18:40
6c3d2e7 to
7357a65
Compare
`curl version` is not a correct command, therefore that prerequisite always succeeded by mistake... Also, the `curl.exe` on the `PATH` is in no way guaranteed to link to the same libcurl (and hence, cURL version) as `git`. So let's teach the `gvfs-helper` to optionally report the cURL version (or perform some version comparison gymnastics). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Johannes Schindelin (dscho)
force-pushed
the
work-around-t5799-failure-with-curl-v8.16.0
branch
2 times, most recently
from
September 29, 2025 19:14
9b52aa2 to
aad1028
Compare
For the t5799.13(no server) test case, we specifically work around a change of behavior in cURL v8.16.0 where the generous default connection timeout of 5 minutes started to be applied several times in instances where a connection is refused. The work-around is to add the `--connect-timeout-ms` option and set it really low in that test case. Unfortunately, with that work-around that cURL version will report a timeout instead of a failure to connect. See curl/curl#18767 for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Johannes Schindelin (dscho)
force-pushed
the
work-around-t5799-failure-with-curl-v8.16.0
branch
from
September 29, 2025 19:58
aad1028 to
b79ae3c
Compare
Johannes Schindelin (dscho)
enabled auto-merge
September 30, 2025 08:32
Matthew John Cheetham (mjcheetham)
approved these changes
Sep 30, 2025
Johannes Schindelin (dscho)
merged commit Sep 30, 2025
4b7e17a
into
vfs-2.51.0
288 of 292 checks passed
Johannes Schindelin (dscho)
deleted the
work-around-t5799-failure-with-curl-v8.16.0
branch
September 30, 2025 08:51
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I investigated a couple of new test failures over in #799; Turns out that they were not introduced by the patches in that PR, but by the independent Git for Windows SDK update of cURL to v8.16.0.
I have a fix for the Git for Windows SDK in git-for-windows/MINGW-packages#163 that I plan on fast-tracking, but since Microsoft Git also targets Linux and macOS (where we do not control the cURL version), here is a work-around.
This PR also adds some clean-ups for the
t5799-gvfs-helper.shtest script in general, e.g. to improve future debug'ability.