t1300-repo-config: make it resilient to being run via 'sh -x'
One way to diagnose broken regression tests is to run the test script using 'sh -x t... -i -v' to find out which call actually demonstrates the symptom. Hence it is pretty counterproductive if the test script behaves differently when being run via 'sh -x', in particular when using test_cmp or test_i18ncmp on redirected stderr. A more recent way "sh tXXXX -i -v -x" has the same issue. So let's use test_i18ngrep (as suggested by Jonathan Nieder) instead of test_cmp/test_i18ncmp to verify that stderr looks as expected. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 23, 2016 at 11:55 UTC
2ec20212c56575dc5e6875f36fa68b6b4a8edd70
1 file changed
+2
-6
t/t1300-repo-config.sh
+2
-6
@@ -699,17 +699,13 @@ test_expect_success 'invalid unit' '
699
echo 1auto >expect &&
700
git config aninvalid.unit >actual &&
701
test_cmp expect actual &&
702
- cat >expect <<-\EOF &&
703
- fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in file .git/config: invalid unit
704
- EOF
702
test_must_fail git config --int --get aninvalid.unit 2>actual &&
706
- test_i18ncmp expect actual
703
+ test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
704
'
705
706
test_expect_success 'invalid stdin config' '
710
- echo "fatal: bad config line 1 in standard input " >expect &&
707
echo "[broken" | test_must_fail git config --list --file - >output 2>&1 &&
712
- test_cmp expect output
708
+ test_i18ngrep "bad config line 1 in standard input" output
709
'
710
711
cat > expect << EOF