[PATCH 2/2] t5570: Update for clone-progress-to-stderr branch
- From
Brian Gernhardt <brian@gernhardtsoftware.com>
- Date
- Oct 21, 2013, 17:54 UTC
- Message-ID
- <1382378052-89929-2-git-send-email-brian@gernhardtsoftware.com>
- In-Reply-To
- <1382378052-89929-1-git-send-email-brian@gernhardtsoftware.com>
git clone now reports its progress to standard error, which throws off t5570. Using test_i18ngrep instead of test_cmp allows the test to be more flexible by only looking for the expected error and ignoring any other output from the program.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> --- t/t5570-git-daemon.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index dc55e51..e061468 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -122,8 +122,7 @@ test_remote_error() fi test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output && - echo "fatal: remote error: $msg: /$repo" >expect && - test_cmp expect output + test_i18ngrep "fatal: remote error: $msg: /$repo" output && ret=$? chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" (exit $ret)
-- 1.8.3.4 (Apple Git-47)