[PATCH 3/4] tmp: remote-helper: add timers to catch errors
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 1, 2013, 21:46 UTC
- Message-ID
- <1364852804-31875-4-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1364852804-31875-1-git-send-email-felipe.contreras@gmail.com>
This way the test reliably succeeds (in catching the failure).
Not sure what's the proper way to do this, but here it is for the record.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- git-remote-testgit | 1 + t/t5801-remote-helpers.sh | 2 +- transport-helper.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/git-remote-testgit b/git-remote-testgit index ca0cf09..6ae1b7f 100755 --- a/git-remote-testgit +++ b/git-remote-testgit @@ -75,6 +75,7 @@ do export) if test -n "$GIT_REMOTE_TESTGIT_FAILURE" then + sleep 1 # don't let fast-export get SIGPIPE exit -1 fi diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 26e9a5b..5bb2ca4 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -176,7 +176,7 @@ test_expect_success 'proper failure checks for fetching' ' ' # We sleep to give fast-export a chance to catch the SIGPIPE -test_expect_failure 'proper failure checks for pushing' ' +test_expect_success 'proper failure checks for pushing' ' (GIT_REMOTE_TESTGIT_FAILURE=1 && export GIT_REMOTE_TESTGIT_FAILURE && cd local && diff --git a/transport-helper.c b/transport-helper.c index dfdfa7a..f0d28aa 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -823,6 +823,9 @@ static int push_refs_with_export(struct transport *transport, if (finish_command(&exporter)) die("Error while running fast-export"); + if (getenv("GIT_REMOTE_TESTGIT_FAILURE")) + sleep(2); + if (!check_command(data->helper)) die("Error while running helper");
-- 1.8.2