| Message ID | 20230403223338.468025-2-rybak.a.v@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | t: fix unused files, part 2 | expand |
On Tue, Apr 04 2023, Andrei Rybak wrote: > Test 'credential config with partial URLs' in t0300-credentials.sh > contains three "git credential fill" invocations. For two of the > invocations, the test asserts presence or absence of string "yep" in the > standard output. For the third test it checks for an error message in > standard error. > > Don't redirect standard output of "git credential" to file "stdout" in > t0300-credentials.sh to avoid creating an unnecessary file when only > standard error is checked. > > Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> > --- > t/t0300-credentials.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh > index c66d91e82d..b8612ede95 100755 > --- a/t/t0300-credentials.sh > +++ b/t/t0300-credentials.sh > @@ -808,7 +808,7 @@ test_expect_success 'credential config with partial URLs' ' > > git -c credential.$partial.helper=yep \ > -c credential.with%0anewline.username=uh-oh \ > - credential fill <stdin >stdout 2>stderr && > + credential fill <stdin 2>stderr && > test_i18ngrep "skipping credential lookup for key" stderr > ' This goes for these changes in this series general: You're correct that this is useless now, but I don't think it follows that we should be removing the "redundant" code in all cases, rather than fixing the test to actually check these. E.g. this will also make this test pass: diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh index c66d91e82d8..62c2a0fd50e 100755 --- a/t/t0300-credentials.sh +++ b/t/t0300-credentials.sh @@ -806,9 +806,11 @@ test_expect_success 'credential config with partial URLs' ' return 1 done && + cp stdout stdout.last && git -c credential.$partial.helper=yep \ -c credential.with%0anewline.username=uh-oh \ credential fill <stdin >stdout 2>stderr && + test_cmp stdout.last stdout && test_i18ngrep "skipping credential lookup for key" stderr ' Does that make sense? No idea, I don't know the credential system well. But isn't it worth testing that when we ask for this that we're getting some known output along with the warning?
On 06/04/2023 10:34, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Apr 04 2023, Andrei Rybak wrote: > >> Test 'credential config with partial URLs' in t0300-credentials.sh >> contains three "git credential fill" invocations. For two of the >> invocations, the test asserts presence or absence of string "yep" in the >> standard output. For the third test it checks for an error message in >> standard error. >> >> Don't redirect standard output of "git credential" to file "stdout" in >> t0300-credentials.sh to avoid creating an unnecessary file when only >> standard error is checked. >> >> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> >> --- >> t/t0300-credentials.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh >> index c66d91e82d..b8612ede95 100755 >> --- a/t/t0300-credentials.sh >> +++ b/t/t0300-credentials.sh >> @@ -808,7 +808,7 @@ test_expect_success 'credential config with partial URLs' ' >> >> git -c credential.$partial.helper=yep \ >> -c credential.with%0anewline.username=uh-oh \ >> - credential fill <stdin >stdout 2>stderr && >> + credential fill <stdin 2>stderr && >> test_i18ngrep "skipping credential lookup for key" stderr >> ' > > This goes for these changes in this series general: You're correct that > this is useless now, but I don't think it follows that we should be > removing the "redundant" code in all cases, rather than fixing the test > to actually check these. I'll reply to these on one-by-one. See also this review of a patch in part 1 of this series from Junio C Hamano: https://lore.kernel.org/git/xmqqsfe8s56p.fsf@gitster.g/ > E.g. this will also make this test pass: > > diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh > index c66d91e82d8..62c2a0fd50e 100755 > --- a/t/t0300-credentials.sh > +++ b/t/t0300-credentials.sh > @@ -806,9 +806,11 @@ test_expect_success 'credential config with partial URLs' ' > return 1 > done && > > + cp stdout stdout.last && > git -c credential.$partial.helper=yep \ > -c credential.with%0anewline.username=uh-oh \ > credential fill <stdin >stdout 2>stderr && > + test_cmp stdout.last stdout && > test_i18ngrep "skipping credential lookup for key" stderr > ' > > > Does that make sense? No idea, I don't know the credential system well. > > But isn't it worth testing that when we ask for this that we're getting > some known output along with the warning? Current version from branch "master" with more context lines: > test_expect_success 'credential config with partial URLs' ' > echo "echo password=yep" | write_script git-credential-yep && > test_write_lines url=https://user@example.com/repo.git >stdin && The test is checking that "url=https://user@example.com/repo.git" matches ... > for partial in \ > example.com \ > user@example.com \ > https:// \ > https://example.com \ > https://example.com/ \ > https://user@example.com \ > https://user@example.com/ \ > https://example.com/repo.git \ > https://user@example.com/repo.git \ > /repo.git ... these partial URLs ... > do > git -c credential.$partial.helper=yep \ > credential fill <stdin >stdout && > grep yep stdout || > return 1 > done && > > for partial in \ > dont.use.this \ > http:// \ > /repo ... but doesn't match these. > do > git -c credential.$partial.helper=yep \ > credential fill <stdin >stdout && > ! grep yep stdout || Here "! grep yep stdout" ensures that git-credential-yep isn't launched for the three kinds of partial URLs. Otherwise, the actual content of "stdout" is ignored. It comes from script "askpass" (see bottom of file "t/lib-credential.sh"). Absence or presence of "yep" is a proxy for whether or not partial URL got matched or not, and that is what's important for this test. Adding assertions for output of "askpass" here would only obscure this fact, I think. There are other tests in t030[0-3] that do check standard output for what the helper script "askpass" prints out -- those tests validate that the "git credentials" fallbacks to asking for credentials in the terminal in various situations. This is done via functions helper_test and helper_test_timeout from "t/lib-credential.sh". > return 1 > done && > > git -c credential.$partial.helper=yep \ > -c credential.with%0anewline.username=uh-oh \ > credential fill <stdin >stdout 2>stderr && > test_i18ngrep "skipping credential lookup for key" stderr Here, the important part is that "git credential" reacts to invalid key being used: "credential.with%0anewline.username=uh-oh", and similarly, I think that adding assertions about "stdout" might not be a good idea. >' Perhaps Johannes Schindelin, author of commit 9a121b0d22 ("credential: handle `credential.<partial-URL>.<key>` again", 2020-04-24), could chime in.
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh index c66d91e82d..b8612ede95 100755 --- a/t/t0300-credentials.sh +++ b/t/t0300-credentials.sh @@ -808,7 +808,7 @@ test_expect_success 'credential config with partial URLs' ' git -c credential.$partial.helper=yep \ -c credential.with%0anewline.username=uh-oh \ - credential fill <stdin >stdout 2>stderr && + credential fill <stdin 2>stderr && test_i18ngrep "skipping credential lookup for key" stderr '
Test 'credential config with partial URLs' in t0300-credentials.sh contains three "git credential fill" invocations. For two of the invocations, the test asserts presence or absence of string "yep" in the standard output. For the third test it checks for an error message in standard error. Don't redirect standard output of "git credential" to file "stdout" in t0300-credentials.sh to avoid creating an unnecessary file when only standard error is checked. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> --- t/t0300-credentials.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)