t7006: use test_config helpers

In some cases, this is just making the test script a little
shorter and easier to read. However, there are several
places where we didn't take proper precautions against
polluting downstream tests with our config; this fixes them,
too.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index c0a3135c73f3e8800217d8f1c21786393c71415b..2ac729f40c730746d799a3c02c4f86ddb89cae57 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -13,7 +13,7 @@ cleanup_fail() {
 
 test_expect_success 'setup' '
        sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
 
 test_expect_success 'setup' '
        sane_unset GIT_PAGER GIT_PAGER_IN_USE &&

-       test_might_fail git config --unset core.pager &&
+       test_unconfig core.pager &&

 
        PAGER="cat >paginated.out" &&
        export PAGER &&
 
        PAGER="cat >paginated.out" &&
        export PAGER &&


@@ -94,21 +94,19 @@ test_expect_success TTY 'no pager with --no-pager' '
 
 test_expect_success TTY 'configuration can disable pager' '
        rm -f paginated.out &&
 
 test_expect_success TTY 'configuration can disable pager' '
        rm -f paginated.out &&

-       test_might_fail git config --unset pager.grep &&
+       test_unconfig pager.grep &&

        test_terminal git grep initial &&
        test -e paginated.out &&
 
        rm -f paginated.out &&
        test_terminal git grep initial &&
        test -e paginated.out &&
 
        rm -f paginated.out &&

-       git config pager.grep false &&
-       test_when_finished "git config --unset pager.grep" &&
+       test_config pager.grep false &&

        test_terminal git grep initial &&
        ! test -e paginated.out
 '
 
 test_expect_success TTY 'git config uses a pager if configured to' '
        rm -f paginated.out &&
        test_terminal git grep initial &&
        ! test -e paginated.out
 '
 
 test_expect_success TTY 'git config uses a pager if configured to' '
        rm -f paginated.out &&

-       git config pager.config true &&
-       test_when_finished "git config --unset pager.config" &&
+       test_config pager.config true &&

        test_terminal git config --list &&
        test -e paginated.out
 '
        test_terminal git config --list &&
        test -e paginated.out
 '


@@ -116,8 +114,7 @@ test_expect_success TTY 'git config uses a pager if configured to' '
 test_expect_success TTY 'configuration can enable pager (from subdir)' '
        rm -f paginated.out &&
        mkdir -p subdir &&
 test_expect_success TTY 'configuration can enable pager (from subdir)' '
        rm -f paginated.out &&
        mkdir -p subdir &&

-       git config pager.bundle true &&
-       test_when_finished "git config --unset pager.bundle" &&
+       test_config pager.bundle true &&

 
        git bundle create test.bundle --all &&
        rm -f paginated.out subdir/paginated.out &&
 
        git bundle create test.bundle --all &&
        rm -f paginated.out subdir/paginated.out &&


@@ -150,7 +147,7 @@ test_expect_success 'tests can detect color' '
 
 test_expect_success 'no color when stdout is a regular file' '
        rm -f colorless.log &&
 
 test_expect_success 'no color when stdout is a regular file' '
        rm -f colorless.log &&

-       git config color.ui auto ||
+       test_config color.ui auto ||

        cleanup_fail &&
 
        git log >colorless.log &&
        cleanup_fail &&
 
        git log >colorless.log &&


@@ -159,7 +156,7 @@ test_expect_success 'no color when stdout is a regular file' '
 
 test_expect_success TTY 'color when writing to a pager' '
        rm -f paginated.out &&
 
 test_expect_success TTY 'color when writing to a pager' '
        rm -f paginated.out &&

-       git config color.ui auto ||
+       test_config color.ui auto ||

        cleanup_fail &&
 
        (
        cleanup_fail &&
 
        (


@@ -172,7 +169,7 @@ test_expect_success TTY 'color when writing to a pager' '
 
 test_expect_success 'color when writing to a file intended for a pager' '
        rm -f colorful.log &&
 
 test_expect_success 'color when writing to a file intended for a pager' '
        rm -f colorful.log &&

-       git config color.ui auto ||
+       test_config color.ui auto ||

        cleanup_fail &&
 
        (
        cleanup_fail &&
 
        (


@@ -221,7 +218,7 @@ test_default_pager() {
 
        $test_expectation SIMPLEPAGER,TTY "$cmd - default pager is used by default" "
                sane_unset PAGER GIT_PAGER &&
 
        $test_expectation SIMPLEPAGER,TTY "$cmd - default pager is used by default" "
                sane_unset PAGER GIT_PAGER &&

-               test_might_fail git config --unset core.pager &&
+               test_unconfig core.pager &&

                rm -f default_pager_used ||
                cleanup_fail &&
 
                rm -f default_pager_used ||
                cleanup_fail &&
 


@@ -244,7 +241,7 @@ test_PAGER_overrides() {
 
        $test_expectation TTY "$cmd - PAGER overrides default pager" "
                sane_unset GIT_PAGER &&
 
        $test_expectation TTY "$cmd - PAGER overrides default pager" "
                sane_unset GIT_PAGER &&

-               test_might_fail git config --unset core.pager &&
+               test_unconfig core.pager &&

                rm -f PAGER_used ||
                cleanup_fail &&
 
                rm -f PAGER_used ||
                cleanup_fail &&
 


@@ -277,7 +274,7 @@ test_core_pager() {
 
                PAGER=wc &&
                export PAGER &&
 
                PAGER=wc &&
                export PAGER &&

-               git config core.pager 'wc >core.pager_used' &&
+               test_config core.pager 'wc >core.pager_used' &&

                $full_command &&
                ${if_local_config}test -e core.pager_used
        "
                $full_command &&
                ${if_local_config}test -e core.pager_used
        "


@@ -307,7 +304,7 @@ test_pager_subdir_helper() {
                PAGER=wc &&
                stampname=\$(pwd)/core.pager_used &&
                export PAGER stampname &&
                PAGER=wc &&
                stampname=\$(pwd)/core.pager_used &&
                export PAGER stampname &&

-               git config core.pager 'wc >\"\$stampname\"' &&
+               test_config core.pager 'wc >\"\$stampname\"' &&

                mkdir sub &&
                (
                        cd sub &&
                mkdir sub &&
                (
                        cd sub &&


@@ -324,7 +321,7 @@ test_GIT_PAGER_overrides() {
                rm -f GIT_PAGER_used ||
                cleanup_fail &&
 
                rm -f GIT_PAGER_used ||
                cleanup_fail &&
 

-               git config core.pager wc &&
+               test_config core.pager wc &&

                GIT_PAGER='wc >GIT_PAGER_used' &&
                export GIT_PAGER &&
                $full_command &&
                GIT_PAGER='wc >GIT_PAGER_used' &&
                export GIT_PAGER &&
                $full_command &&


@@ -405,8 +402,8 @@ test_expect_success TTY 'command-specific pager' '
        sane_unset PAGER GIT_PAGER &&
        echo "foo:initial" >expect &&
        >actual &&
        sane_unset PAGER GIT_PAGER &&
        echo "foo:initial" >expect &&
        >actual &&

-       git config --unset core.pager &&
-       git config pager.log "sed s/^/foo:/ >actual" &&
+       test_unconfig core.pager &&
+       test_config pager.log "sed s/^/foo:/ >actual" &&

        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '
        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '


@@ -415,8 +412,8 @@ test_expect_success TTY 'command-specific pager overrides core.pager' '
        sane_unset PAGER GIT_PAGER &&
        echo "foo:initial" >expect &&
        >actual &&
        sane_unset PAGER GIT_PAGER &&
        echo "foo:initial" >expect &&
        >actual &&

-       git config core.pager "exit 1"
-       git config pager.log "sed s/^/foo:/ >actual" &&
+       test_config core.pager "exit 1"
+       test_config pager.log "sed s/^/foo:/ >actual" &&

        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '
        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '


@@ -425,7 +422,7 @@ test_expect_success TTY 'command-specific pager overridden by environment' '
        GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
        >actual &&
        echo "foo:initial" >expect &&
        GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
        >actual &&
        echo "foo:initial" >expect &&

-       git config pager.log "exit 1" &&
+       test_config pager.log "exit 1" &&

        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '
        test_terminal git log --format=%s -1 &&
        test_cmp expect actual
 '