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 c2a6d7d478dec2871ee0b42196791b06631084fd..5925d1b58dfdb8c439527914c1af8f92dfda06f5 100644 (file)
--- 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 9fb2c5d565bca696fe6f09813c8a6f1190e48b24..9b37ca62e11622769ab2857de13f6ddadc899702 100755 (executable)
--- 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