From: SZEDER Gábor Date: Tue, 13 Feb 2018 00:36:01 +0000 (+0100) Subject: t6300-for-each-ref: fix "more than one quoting style" tests X-Git-Tag: v2.17.0-rc0~44^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2708ef4af6ed60b89e93de72673e7b785b93d760;p=thirdparty%2Fgit.git t6300-for-each-ref: fix "more than one quoting style" tests 'git for-each-ref' should error out when invoked with more than one quoting style options. The tests checking this have two issues: - They run 'git for-each-ref' upstream of a pipe, hiding its exit code, thus don't actually checking that 'git for-each-ref' exits with error code. - They check the error message in a rather roundabout way. Ensure that 'git for-each-ref' exits with an error code using the 'test_must_fail' helper function, and check its error message by grepping its saved standard error. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index c128dfc579..295d1475bd 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -373,11 +373,8 @@ test_expect_success 'Quoting style: tcl' ' for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do test_expect_success "more than one quoting style: $i" " - git for-each-ref $i 2>&1 | (read line && - case \$line in - \"error: more than one quoting style\"*) : happy;; - *) false - esac) + test_must_fail git for-each-ref $i 2>err && + grep '^error: more than one quoting style' err " done