t5570: Update for clone-progress-to-stderr branch
authorBrian Gernhardt <brian@gernhardtsoftware.com>
Mon, 21 Oct 2013 17:54:12 +0000 (13:54 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Oct 2013 18:38:53 +0000 (11:38 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5570-git-daemon.sh
index dc55e51c18e5fac1e9347dc64447d4cdf1ddd347..e06146835cdda5b7264a34a24405aedd9f950006 100755 (executable)
@@ -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)