@matheusbsbs / matheus-bagliano / commits / 93f86046c9

t1300: check stderr for "ignores pairs" tests

Tests "git config ignores pairs ..." in t1300-config.sh validate that "git config" ignores various kinds of supplied pairs of environment variables GIT_CONFIG_KEY_* GIT_CONFIG_VALUE_* depending on GIT_CONFIG_COUNT. By "ignores" here we mean that "git config" abides by the value of environment variable GIT_CONFIG_COUNT and doesn't use key-value pairs outside of the supplied GIT_CONFIG_COUNT when trying to produce a value for config key "pair.one". These tests also validate that "git config" doesn't complain about mismatched environment variables to standard error. This is validated by redirecting the standard error to a file called "error" and asserting that it is empty. However, two of these tests incorrectly redirect to standard output while calling the file "error", and test 'git config ignores pairs exceeding count' doesn't validate standard error at all. Fix these tests by redirecting standard error to file "error" and asserting its emptiness. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Andrei Rybak committed Apr 23, 2023 at 15:46 UTC 93f86046c94545e36aceef9eef084b60d02f4c59

1 file changed +5 -4

t/t1300-config.sh

+5 -4

@@ -1462,24 +1462,25 @@ test_expect_success 'git config ignores pairs exceeding count' '

1462 GIT_CONFIG_COUNT=1 \

1463 GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \

1464 GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="value" \

1465 - git config --get-regexp "pair.*" >actual &&

1465 + git config --get-regexp "pair.*" >actual 2>error &&

1466 cat >expect <<-EOF &&

1467 pair.one value

1468 EOF

1469 - test_cmp expect actual

1469 + test_cmp expect actual &&

1470 + test_must_be_empty error

1471 '

1472

1473 test_expect_success 'git config ignores pairs with zero count' '

1474 test_must_fail env \

1475 GIT_CONFIG_COUNT=0 GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \

1475 - git config pair.one >error &&

1476 + git config pair.one 2>error &&

1477 test_must_be_empty error

1478 '

1479

1480 test_expect_success 'git config ignores pairs with empty count' '

1481 test_must_fail env \

1482 GIT_CONFIG_COUNT= GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \

1482 - git config pair.one >error &&

1483 + git config pair.one 2>error &&

1484 test_must_be_empty error

1485 '

1486