[PATCH v2 13/27] userdiff tests: do config teardown in test_diff_funcname()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 15, 2021, 15:44 UTC
- Message-ID
- <20210215154427.32693-14-avarab@gmail.com>
- In-Reply-To
- <20210215005236.11313-1-avarab@gmail.com>
Do a teardown of any custom "diff.<what>.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 <avarab@gmail.com> --- 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 decf7961f9..4cb0b7ba2b 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -78,6 +78,13 @@ test_diff_funcname () { git diff -U1 "$what" >diff && sed -n -e "s/^.*@@$//p" -e "s/^.*@@ //p" <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