t7800: improve test descriptions with empty arguments
Some of the tests in t7800 are executed repeatedly in a loop with different arguments. To distinguish these tests, the value of that variable is rendered into the test title. But given that one of the values is the empty string, it results in a somewhat awkward test name: difftool ignores exit code Improve this by printing "without options" in case the value is empty. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Mar 22, 2024 at 03:23 UTC
ac45f68866fbdbe14384d1b8964824ffac9d1e6b
1 file changed
+8
-8
t/t7800-difftool.sh
+8
-8
@@ -93,40 +93,40 @@ test_expect_success 'difftool forwards arguments to diff' '
93
94
for opt in '' '--dir-diff'
95
do
96
- test_expect_success "difftool ${opt} ignores exit code" "
96
+ test_expect_success "difftool ${opt:-without options} ignores exit code" "
97
test_config difftool.error.cmd false &&
98
git difftool ${opt} -y -t error branch
99
"
100
101
- test_expect_success "difftool ${opt} forwards exit code with --trust-exit-code" "
101
+ test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code" "
102
test_config difftool.error.cmd false &&
103
test_must_fail git difftool ${opt} -y --trust-exit-code -t error branch
104
"
105
106
- test_expect_success "difftool ${opt} forwards exit code with --trust-exit-code for built-ins" "
106
+ test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code for built-ins" "
107
test_config difftool.vimdiff.path false &&
108
test_must_fail git difftool ${opt} -y --trust-exit-code -t vimdiff branch
109
"
110
111
- test_expect_success "difftool ${opt} honors difftool.trustExitCode = true" "
111
+ test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = true" "
112
test_config difftool.error.cmd false &&
113
test_config difftool.trustExitCode true &&
114
test_must_fail git difftool ${opt} -y -t error branch
115
"
116
117
- test_expect_success "difftool ${opt} honors difftool.trustExitCode = false" "
117
+ test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = false" "
118
test_config difftool.error.cmd false &&
119
test_config difftool.trustExitCode false &&
120
git difftool ${opt} -y -t error branch
121
"
122
123
- test_expect_success "difftool ${opt} ignores exit code with --no-trust-exit-code" "
123
+ test_expect_success "difftool ${opt:-without options} ignores exit code with --no-trust-exit-code" "
124
test_config difftool.error.cmd false &&
125
test_config difftool.trustExitCode true &&
126
git difftool ${opt} -y --no-trust-exit-code -t error branch
127
"
128
129
- test_expect_success "difftool ${opt} stops on error with --trust-exit-code" "
129
+ test_expect_success "difftool ${opt:-without options} stops on error with --trust-exit-code" "
130
test_when_finished 'rm -f for-diff .git/fail-right-file' &&
131
test_when_finished 'git reset -- for-diff' &&
132
write_script .git/fail-right-file <<-\EOF &&
@@ -140,7 +140,7 @@ do
140
test_line_count = 1 actual
141
"
142
143
- test_expect_success "difftool ${opt} honors exit status if command not found" "
143
+ test_expect_success "difftool ${opt:-without options} honors exit status if command not found" "
144
test_config difftool.nonexistent.cmd i-dont-exist &&
145
test_config difftool.trustExitCode false &&
146
if test "${opt}" = '--dir-diff'