Skip to content

Commit cf7a851

Browse files
avargitster
authored andcommitted
tests: mark two failing tests under FAIL_PREREQS
Fix a couple of tests that would potentially fail under GIT_TEST_FAIL_PREREQS=true. I missed these when annotating other tests in dfe1a17 ("tests: add a special setup where prerequisites fail", 2019-05-13) because on my system I can only reproduce this failure when I run the tests as "root", since the tests happen to depend on whether we can fall back on GECOS info or not. I.e. they'd usually fail to look up the ident info anyway, but not always. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dfe1a17 commit cf7a851

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

t/t0007-git-var.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test_expect_success 'get GIT_COMMITTER_IDENT' '
1717
test_cmp expect actual
1818
'
1919

20-
test_expect_success !AUTOIDENT 'requested identites are strict' '
20+
test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' '
2121
(
2222
sane_unset GIT_COMMITTER_NAME &&
2323
sane_unset GIT_COMMITTER_EMAIL &&

t/t7502-commit-porcelain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ echo editor started >"$(pwd)/.git/result"
402402
exit 0
403403
EOF
404404

405-
test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
405+
test_expect_success !FAIL_PREREQS,!AUTOIDENT 'do not fire editor when committer is bogus' '
406406
>.git/result &&
407407
408408
echo >>negative &&

0 commit comments

Comments
 (0)