From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Apr 2020 20:42:42 +0000 (-0700)
Subject: Merge branch 'jk/t3419-drop-expensive-tests'
X-Git-Tag: v2.27.0-rc0~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21e3bb1299468341a78149bf970842283ff8d9e2;p=thirdparty%2Fgit.git

Merge branch 'jk/t3419-drop-expensive-tests'

Test update.

* jk/t3419-drop-expensive-tests:
  t3419: drop EXPENSIVE tests
---

21e3bb1299468341a78149bf970842283ff8d9e2
diff --cc t/t3419-rebase-patch-id.sh
index d934583776,3dc754b13a..1f32faa4a4
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@@ -36,66 -22,49 +22,50 @@@ test_expect_success 'setup' 
  	git tag root
  '
  
- do_tests () {
- 	nlines=$1 pr=${2-}
- 
- 	test_expect_success $pr "setup: $nlines lines" "
- 		rm -f .gitattributes &&
- 		git checkout -q -f master &&
- 		git reset --hard root &&
- 		count $nlines >file &&
- 		git add file &&
- 		git commit -q -m initial &&
- 		git branch -f other &&
- 
- 		scramble file &&
- 		git add file &&
- 		git commit -q -m 'change big file' &&
- 
- 		git checkout -q other &&
- 		: >newfile &&
- 		git add newfile &&
- 		git commit -q -m 'add small file' &&
- 
- 		git cherry-pick master >/dev/null 2>&1
- 	"
- 
- 	test_debug "
- 		run git diff master^\!
- 	"
- 
- 	test_expect_success $pr 'setup attributes' "
- 		echo 'file binary' >.gitattributes
- 	"
- 
- 	test_debug "
- 		run git format-patch --stdout master &&
- 		run git format-patch --stdout --ignore-if-in-upstream master
- 	"
+ test_expect_success 'setup: 500 lines' '
+ 	rm -f .gitattributes &&
+ 	git checkout -q -f master &&
+ 	git reset --hard root &&
+ 	test_seq 500 >file &&
+ 	git add file &&
+ 	git commit -q -m initial &&
+ 	git branch -f other &&
+ 
+ 	scramble file &&
+ 	git add file &&
+ 	git commit -q -m "change big file" &&
+ 
+ 	git checkout -q other &&
+ 	: >newfile &&
+ 	git add newfile &&
+ 	git commit -q -m "add small file" &&
+ 
+ 	git cherry-pick master >/dev/null 2>&1
+ '
  
- 	test_expect_success $pr 'detect upstream patch' '
- 		git checkout -q master &&
- 		scramble file &&
- 		git add file &&
- 		git commit -q -m "change big file again" &&
- 		git checkout -q other^{} &&
- 		git rebase master &&
- 		git rev-list master...HEAD~ >revs &&
- 		test_must_be_empty revs
- 	'
+ test_expect_success 'setup attributes' '
+ 	echo "file binary" >.gitattributes
+ '
  
- 	test_expect_success $pr 'do not drop patch' '
- 		git branch -f squashed master &&
- 		git checkout -q -f squashed &&
- 		git reset -q --soft HEAD~2 &&
- 		git commit -q -m squashed &&
- 		git checkout -q other^{} &&
- 		test_must_fail git rebase squashed &&
- 		git rebase --quit
- 	'
- }
+ test_expect_success 'detect upstream patch' '
+ 	git checkout -q master &&
+ 	scramble file &&
+ 	git add file &&
+ 	git commit -q -m "change big file again" &&
+ 	git checkout -q other^{} &&
+ 	git rebase master &&
 -	test_must_fail test -n "$(git rev-list master...HEAD~)"
++	git rev-list master...HEAD~ >revs &&
++	test_must_be_empty revs
+ '
  
- do_tests 500
- do_tests 50000 EXPENSIVE
+ test_expect_success 'do not drop patch' '
+ 	git branch -f squashed master &&
+ 	git checkout -q -f squashed &&
+ 	git reset -q --soft HEAD~2 &&
+ 	git commit -q -m squashed &&
+ 	git checkout -q other^{} &&
+ 	test_must_fail git rebase squashed &&
+ 	git rebase --quit
+ '
  
  test_done