On Tue, Nov 01 2022, Jeff King wrote: > On Tue, Nov 01, 2022 at 04:29:31AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> > It is unclear as to _why_, but under certain circumstances the warning >> > about credentials being passed as part of the URL seems to be swallowed >> > by the `git remote-https` helper in the Windows jobs of Git's CI builds. >> >> ..this description dosen't match what the patch is doing, okey, so >> there's a case where the remote helper swallows the warnings, i.e. we'll >> emit fewer than we expected... > > So I really didn't revisit this commit much at all, and was just trying > to save Dscho (or Taylor) the work of having to rebase it, if we go with > my patch 1. > > IMHO it is OK enough as it is, but if I were writing it from scratch I > probably would have given the rationale that the tests are insiting on a > dumb, sub-optimal behavior. And flakes or inconsistencies aside, they > should be asserting only the presence or absence of the message. And > probably would have left each at "grep" and dropped the test_line_count > totally. Do you mean that even if we fix the bug and consistently emit one and only one such message you'd like to have the tests not assert that that's the case? I do think that UX is important enough to test for, particularly if we've had a bug related to that that we've fixed. I.e. if something in the direction of my [1] goes in. > It is not even clear to me that the remote-https is the one being > swallowed (at least, I have not seen an argument or evidence that this > is so; it does seem plausible). It is the case, the only ones that are going to be duplicated are the "warn" ones, because for "die" we'll die right away in the parent process. Which is what I'm trying to get across here, and why I'm a bit confused. I.e. I thought you'd agree that we should test that we emit exactly one warning if & when we've fixed the underlying issue. That issue is already fixed for "die", so even if you want to loosen up the test your [2] should only keep the first line removal/addition in the first two hunks, and drop the 3rd one. >> > @@ -654,7 +654,7 @@ test_expect_success 'push warns or fails when using username:password' ' >> > test_must_fail git -c transfer.credentialsInUrl=die \ >> > push $url_userpass 2>err && >> > grep "fatal: $message" err >warnings && >> > - test_line_count = 1 warnings >> > + test_line_count -ge 1 warnings >> > ' >> >> ...but then why are we modifying these codepaths that have nothing to do >> with invoking the remote helper, i.e. where we die early before we get >> to that? > > If you're arguing that we should only do s/= 3/-ge 1/ for the test that > is flaking, I could buy that. I'm saying that if we're doing a handwaivy-fix and saying "sometimes the message gets swallowed" and fixing this blindly without checking how it works, then changing "= 1" to "-ge 1" doesn't make sense. It should be "-ge 0", i.e. surely that "one warning" can get swallowed too? Now, I know that never happens, because we'll always get at least one. I'm just saying that as soon as you stop to think about that you must also come to the conclusion that the "die" ones are OK as-is. That's because the reason we always get at least one is the same as we're always guaranteed to emit just one in the "die" case: The parent process emits it, then dies. >> And even if some of this was invoking that remote helper and we were >> modifying it blindly, then presumably the helper swallowing it would >> result in 0 some of the time, so "-ge 1" would be wrong. >> >> (That's not the case, but it's why I think the patch doesn't make much >> sense). > > I thought the point is that the outer program calling the helper would > consistently produce the error, always yielding at least one instance. > The helper one is generally "extra" and undesired. Yes, exactly. Which is what my fix[1] the root cause addresses. Anyway, I'm just trying to help here. If you/Johannes/others want to go with the "hotfix" as-is that's fine my me. I just don't see what the hurry is, it's been this way for two releases, if it's flaky that's been the case for months, I'd think we could just fix the root cause. 1. http://lore.kernel.org/git/RFC-patch-1.1-0266485bc6c-20221031T204149Z-avarab@xxxxxxxxx 2. https://lore.kernel.org/git/Y2CD6GBl6ORqKsug@xxxxxxxxxxxxxxxxxxxxxxx/
