From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 23:26:53 +0000 (+0000)
Subject: git-debrebase: test suite: lib-gdr: break out some more t-*
X-Git-Tag: archive/debian/5.0~157
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2045d087abc4445b98649af8eb4883c05573a324

git-debrebase: test suite: lib-gdr: break out some more t-*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 26afb1d3..d45759d7 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -184,3 +184,21 @@ t-nmu-upload-3 () {
 	cd $p
 	git checkout master
 }
+
+t-nmu-commit-an-upstream-change () {
+	echo >>newsrc.c "// more upstream"
+	git add newsrc.c
+	git commit -m 'UPSTREAM NMU'
+}
+
+t-maintainer-commit-some-changes () {
+	t-dch-commit -v$v -m "start $v"
+
+	t-some-changes "maintainer $v"
+	t-git-debrebase
+	t-git-debrebase stitch
+
+	git branch did.maintainer
+
+	t-git-next-date
+}
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 9fb2c5d5..9b37ca62 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -18,24 +18,15 @@ v=2.0-2+nmu1
 t-nmu-upload-1 nmu
 gbp pq import
 t-nmu-upload-2
-echo >>newsrc.c "// more upstream"
-git add newsrc.c
-git commit -m 'UPSTREAM NMU'
+t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 
 : 'done the nmu, switching back to the maintainer hat'
 
 t-git-next-date
 
-t-dch-commit -v2.0-3 -m 'start -3'
-
-t-some-changes 'maintainer'
-t-git-debrebase
-t-git-debrebase stitch
-
-git branch did.maintainer
-
-t-git-next-date
+v=2.0-3
+t-maintainer-commit-some-changes
 
 t-dgit fetch
 t-git-next-date