t6300: fix setup with GPGSSH but without GPG
PATCH 1/1 t6300: fix setup with GPGSSH but without GPG
In a test introduced by 26c9c03f0a (ref-filter: add new "signature" atom, 2023-06-04) the file named "file" is added by a setup step that requires GPG and modified by a second setup step that requires GPGSSH. Systems lacking the first prerequisite skip the initial setup step and then "git commit -a" in the second one doesn't find the modified file. Add it explicitly.
--- t/t6300-for-each-ref.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
t/t6300-for-each-ref.sh +2 -1
@@ -1584,7 +1584,8 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" && echo "8" >file && test_tick && - git commit -a -S -m "file: 8" && + git add file && + git commit -S -m "file: 8" && git tag eighth-signed-ssh '
--
2.41.0
Quoted 7 lines · René Scharfe
In a test introduced by
26c9c03f0a(ref-filter: add new "signature" atom, 2023-06-04) the file named "file" is added by a setup step that requires GPG and modified by a second setup step that requires GPGSSH. Systems lacking the first prerequisite skip the initial setup step and then "git commit -a" in the second one doesn't find the modified file. Add it explicitly.
Right, acked!
Thanks!
Quoted 11 lines · René Scharfe
In a test introduced by
26c9c03f0a(ref-filter: add new "signature" atom, 2023-06-04) the file named "file" is added by a setup step that requires GPG and modified by a second setup step that requires GPGSSH. Systems lacking the first prerequisite skip the initial setup step and then "git commit -a" in the second one doesn't find the modified file. Add it explicitly.Signed-off-by René Scharfe <[email protected]>--- t/t6300-for-each-ref.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks for good eyes.
I guess a box without GPG is not so uncommon, and even such a box can reasonably be expected to have SSH on it, so I would believe if this was discovered on a real development box, but is that how you found this? Or have you invented a nice test helper that lets you pick random set of prerequisites and try permutations of having and not having them, or something nice like that?
Will queue.
Quoted 16 lines
t/t6300-for-each-ref.sh +2
-2@@ -1584,7 +1584,8 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" && echo "8" >file && test_tick && - git commit -a -S -m "file: 8" && + git add file && + git commit -S -m "file: 8" && git tag eighth-signed-ssh ' --2.41.0
Am 17.07.23 um 18:22 schrieb Junio C Hamano:
Quoted 14 lines
Quoted 11 lines · René Scharfe
In a test introduced by
26c9c03f0a(ref-filter: add new "signature" atom, 2023-06-04) the file named "file" is added by a setup step that requires GPG and modified by a second setup step that requires GPGSSH. Systems lacking the first prerequisite skip the initial setup step and then "git commit -a" in the second one doesn't find the modified file. Add it explicitly.Signed-off-by René Scharfe <[email protected]>--- t/t6300-for-each-ref.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 8 lines
Thanks for good eyes.
I guess a box without GPG is not so uncommon, and even such a box can reasonably be expected to have SSH on it, so I would believe if this was discovered on a real development box, but is that how you found this? Or have you invented a nice test helper that lets you pick random set of prerequisites and try permutations of having and not having them, or something nice like that?
The test actually did fail on my machine.
Running tests with all possible permutations of prerequisites would be nice, but sounds very expensive -- there must be billions of them! But there are only a few per test script, I imagine. Collecting all found prerequisites for each script and providing a way to force-disable them individually could make testing them all feasible. Nice idea!
René