[PATCHv2 10/10] git p4 test: fix badp4dir test
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Jun 27, 2012, 12:01 UTC
- Message-ID
- <1340798463-14499-11-git-send-email-pw@padd.com>
- In-Reply-To
- <1340798463-14499-1-git-send-email-pw@padd.com>
The construct used to get the return code was flawed, in that errors in the &&-chain before the semicolon were not caught. Use the standard test_expect_code instead.
Set PATH in a subshell instead of relying on the bashism of setting it just for a single command.
And fix the grep line so it doesn't worry about grep segfaults, and doesn't fail for i18n issues.
Reported-by: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Pete Wyckoff <pw@padd.com> --- t/t9800-git-p4-basic.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index befd823..07c2e15 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -134,9 +134,13 @@ test_expect_success 'exit when p4 fails to produce marshaled output' ' exit 1 EOF chmod 755 badp4dir/p4 && - PATH="$TRASH_DIRECTORY/badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? && - test $retval -eq 1 && - test_must_fail grep -q Traceback errs + ( + PATH="$TRASH_DIRECTORY/badp4dir:$PATH" && + export PATH && + test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1 + ) && + cat errs && + ! test_i18ngrep Traceback errs ' test_expect_success 'clone bare' '
-- 1.7.11.1.69.gd505fd2