test suite: Factor out t-dch-commit-r

[dgit.git] / tests / tests / gdr-import-dgit

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 544878b5fb7127c0d72de5d5408dd5c3f0cf4245..c18c0976f9f60dd9d5b01fd2df47ba06b5a4c85e 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 
@@ -14,6 +14,8 @@ v=2.0-2+nmu1
 t-nmu-upload-1 nmu
 gbp pq import
 t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
 
 : 'done the nmu, switching back to the maintainer hat'
 
@@ -38,7 +40,7 @@ nmu-fold
 
 v=2.0-3
 t-dch-commit -v $v -m "incorporate nmu"
-t-dch-commit -r sid
+t-dch-commit-r
 t-dgit -wgf push-source
 
 : 'now test a new upstream'
@@ -56,6 +58,8 @@ gbp pq import
 #t-dgit -wgf build-source
 
 t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
 
 : 'done the nmu, back to the maintainer'