Merge branch 'jk/test-fixes'

gitster · gitster · commit 0afeb3fdf4be · 2020-01-30T14:17:09.000-08:00
Test fixes.

* jk/test-fixes:
  t7800: don't rely on reuse_worktree_file()
  t4018: drop "debugging" cat from hunk-header tests
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
@@ -106,7 +106,6 @@ do
 		result=success
 	fi
 	test_expect_$result "hunk header: $i" "
-		test_when_finished 'cat actual' &&	# for debugging only
 		git diff -U1 $i >actual &&
 		grep '@@ .* @@.*RIGHT' actual
 	"
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
@@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
 	test_when_finished "rm -f for-diff .git/fail-right-file" &&
 	test_when_finished "git reset -- for-diff" &&
 	write_script .git/fail-right-file <<-\EOF &&
-	echo "$2"
+	echo failed
 	exit 1
 	EOF
 	>for-diff &&
 	git add for-diff &&
-	echo file >expect &&
 	test_must_fail git difftool -y --trust-exit-code \
 		--extcmd .git/fail-right-file branch >actual &&
-	test_cmp expect actual
+	test_line_count = 1 actual
 '
 
 test_expect_success 'difftool honors exit status if command not found' '

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ do`
`106`	`106`	`result=success`
`107`	`107`	`fi`
`108`	`108`	`test_expect_$result "hunk header: $i" "`
`109`		`- test_when_finished 'cat actual' && # for debugging only`
`110`	`109`	`git diff -U1 $i >actual &&`
`111`	`110`	`grep '@@ .* @@.*RIGHT' actual`
`112`	`111`	`"`