# [PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

2 messages from 2008-03-01 to 2008-03-01. Participants: Mike Hommey.
Thread: https://gitlist.dev/t/12403

## Mike Hommey, 2008-03-01 11:12

Subject: [PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
Message-ID: <1204369933-3040-1-git-send-email-mh@glandium.org>
URL: https://gitlist.dev/e/1204369933-3040-1-git-send-email-mh%40glandium.org
In-Reply-To: <mh@glandium.org>

```
Removing .dotest should actually not be needed, so just test the directory
don't exist after --abort, but exists after starting the rebase.

Also, execute the same tests with rebase --merge, which uses a different code
path.

Signed-off-by: Mike Hommey <mh@glandium.org>
---
 t/t3407-rebase-abort.sh |   68 +++++++++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 3417138..37944c3 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -23,37 +23,49 @@ test_expect_success setup '
 	git branch pre-rebase
 '
 
-test_expect_success 'rebase --abort' '
-	test_must_fail git rebase master &&
-	git rebase --abort &&
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
-'
+testrebase() {
+	type=$1
+	dotest=$2
 
-test_expect_success 'rebase --abort after --skip' '
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase
-	rm -rf .dotest
+	test_expect_success "rebase$type --abort" '
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase
+		test_must_fail git rebase'"$type"' master &&
+		test -d '$dotest' &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
 
-	test_must_fail git rebase master &&
-	test_must_fail git rebase --skip &&
-	test $(git rev-parse HEAD) = $(git rev-parse master) &&
-	git rebase --abort &&
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
-'
+	test_expect_success "rebase$type --abort after --skip" '
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase
+		test_must_fail git rebase'"$type"' master &&
+		test -d '$dotest' &&
+		test_must_fail git rebase --skip &&
+		test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		git-rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
 
-test_expect_success 'rebase --abort after --continue' '
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase
-	rm -rf .dotest
+	test_expect_success "rebase$type --abort after --continue" '
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase
+		test_must_fail git rebase'"$type"' master &&
+		test -d '$dotest' &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test $(git rev-parse HEAD) != $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
+}
 
-	test_must_fail git rebase master &&
-	echo c > a &&
-	echo d >> a &&
-	git add a &&
-	test_must_fail git rebase --continue &&
-	test $(git rev-parse HEAD) != $(git rev-parse master) &&
-	git rebase --abort &&
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
-'
+testrebase "" .dotest
+testrebase " --merge" .git/.dotest-merge
 
 test_done
-- 
1.5.4.3.344.g6fd65.dirty


```

## Mike Hommey, 2008-03-01 11:14

Subject: Re: [PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
Message-ID: <20080301111414.GA3112@glandium.org>
URL: https://gitlist.dev/e/20080301111414.GA3112%40glandium.org
In-Reply-To: <1204369933-3040-1-git-send-email-mh@glandium.org>

```
On Sat, Mar 01, 2008 at 12:12:13PM +0100, Mike Hommey wrote:
> Removing .dotest should actually not be needed, so just test the directory
> don't exist after --abort, but exists after starting the rebase.
> 
> Also, execute the same tests with rebase --merge, which uses a different code
> path.
> 
> Signed-off-by: Mike Hommey <mh@glandium.org>

Should have been as a reply to
1204367534-28204-1-git-send-email-mh@glandium.org. Bad copy/paste...
Anyways, this is against your (Junio's) changes.

Mike

```