diff options
| author |  Jeff King <peff@peff.net> | 2012-07-26 16:32:31 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-07-26 14:23:35 -0700 |
| commit | 1d7dc26498b5d7b7879d579f40be63210c50400c (patch) | |
| tree | 17e58821943d7dea6d62919d63f7523dd01fedf8 /t | |
| parent | t7502: drop confusing test_might_fail call (diff) | |
| download | tgif-1d7dc26498b5d7b7879d579f40be63210c50400c.tar.xz | |
t7502: handle systems where auto-identity is broken
Test t7502.21 checks whether we write the committer name
into COMMIT_EDITMSG when it has been automatically
determined. However, not all systems can produce valid
automatic identities.
Prior to f20f387 (commit: check committer identity more
strictly), this test worked even when we did not have a
valid automatic identity, since it did not run the strict
test until after we had generated the template. That commit
tightened the check to fail early (since we would fail
later, anyway), meaning that systems without a valid GECOS
name or hostname would fail the test.
We cannot just work around this, because it depends on
configuration outside the control of the test script.
Therefore we introduce a new test_prerequisite to run this
test only on systems where automatic ident works at all.
As a result, we can drop the confusing test_must_fail bit
from the test. The intent was that by giving "git commit"
invalid input (namely, nothing to commit), that it would
stop at a predictable point, whether we had a valid identity
or not, from which we could view the contents of
COMMIT_EDITMSG. Since that assumption no longer holds, and
we can only run the test when we have a valid identity,
there is no reason not to let commit run to completion. That
lets us be more robust to other unforeseen failures.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7502-commit.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index d261b8252a..c444812a4d 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -243,14 +243,21 @@ test_expect_success 'message shows author when it is not equal to committer' ' .git/COMMIT_EDITMSG ' -test_expect_success 'message shows committer when it is automatic' ' +test_expect_success 'setup auto-ident prerequisite' ' + if (sane_unset GIT_COMMITTER_EMAIL && + sane_unset GIT_COMMITTER_NAME && + git var GIT_COMMITTER_IDENT); then + test_set_prereq AUTOIDENT + fi +' + +test_expect_success AUTOIDENT 'message shows committer when it is automatic' ' echo >>negative && ( sane_unset GIT_COMMITTER_EMAIL && sane_unset GIT_COMMITTER_NAME && - # must fail because there is no change - test_must_fail git commit -e -m "sample" + git commit -e -m "sample" -a ) && # the ident is calculated from the system, so we cannot # check the actual value, only that it is there |