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

[dgit.git] / tests / setup / gdr-convert-gbp

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 0b525c879f99dfdba84651203f4cb9d583fb869e..d64b867c66653482c1ae030df1a3ecbe0f0e1019 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -1,8 +1,11 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 . $troot/lib-gdr
 
+$ifarchive t-setup-import gnupg
+
 t-dependencies GDR
 
 t-tstunt-parsechangelog
@@ -61,7 +64,7 @@ gbp import-orig --upstream-version=2.0 ../$ust
 not-gdr-processable
 
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-t-dch-commit -r sid
+t-dch-commit-r
 
 $ifarchive t-archive-none $p
 $ifarchive t-git-none
@@ -81,9 +84,9 @@ t-git-debrebase -fupstream-has-debian convert-from-gbp
 
 v=2.0-2
 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
-t-dch-commit -r sid
+t-dch-commit-r
 
-$ifarchive t-dgit -wgf push-source --new --overwrite
+$ifarchive t-dgit -wgf push-source --new
 git push
 
 cd ..