From: Ævar Arnfjörð Bjarmason Date: Wed, 24 Feb 2021 19:51:10 GMT Subject: [PATCH v3 16/35] userdiff tests: do config teardown in test_diff_funcname() Message-ID: <20210224195129.4004-17-avarab@gmail.com> In-Reply-To: <20210215154427.32693-1-avarab@gmail.com> Do a teardown of any custom "diff..x?funcname" config after a test_diff_funcname() test runs. Nothing currently uses this, but a follow-up commit will start setting custom config before certain tests. Centralizing this teardown makes the tests simpler. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t4018-diff-funcname.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 7fc4291f4be..496313fc900 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -123,6 +123,13 @@ test_diff_funcname () { git diff -U1 "$what" >diff && last_diff_context_line diff >actual && test_cmp expected actual + ' && + + test_expect_success "teardown: $desc" ' + # In case any custom config was set immediately before + # the test itself in the test file + test_unconfig "diff.$what.funcname" && + test_unconfig "diff.$what.xfuncname" ' } -- 2.30.0.284.gd98b1dd5eaa7