Thread (16 messages) flat view 16 messages, 3 authors, 2016-06-15
STALE3735d

[PATCH 10/10] t4124 (apply --whitespace): use test_might_fail

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:57
Subsystem: the rest · Maintainer: Linus Torvalds

Use test_might_fail instead of ignoring the exit status from git
config --unset, and let the exit status propagate past rm -f (which
does not fail on ENOENT).  Otherwise bugs that lead git config to
crash would not be detected when this test runs.

Signed-off-by: Jonathan Nieder <redacted>
---
 t/t4124-apply-ws-rule.sh |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 414b09b..61bfc56 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -176,9 +176,8 @@ test_expect_success 'trailing whitespace & no newline at the end of file' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=fix (1)' '
-	: these can fail depending on what we did before
-	git config --unset core.whitespace
-	rm -f .gitattributes
+	test_might_fail git config --unset core.whitespace &&
+	rm -f .gitattributes &&
 
 	{ echo a; echo b; echo c; } >one &&
 	git add one &&
-- 
1.7.2.3.557.gab647.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help