git-debrebase: test suite: introduce t-make-new-upstream-tarball

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 7608a12987c190cc37ba50a4cad0288043d51bb8..ac949dfa0d2f0dfbbd3553340f918cbcaf09ca67 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -37,11 +37,8 @@ git commit -m "patch queue update ($0)"
 not-gdr-processable
 
 : 'fake up an upstream 2.0'
-git checkout -b make-upstream upstream
-echo upstream-v2 >>docs/README
-git commit -a -m "an upstream v2 update"
-ust=example_2.0.orig.tar.gz
-git archive -o ../$ust --prefix=example-2.0/ make-upstream
+git branch make-upstream upstream
+t-make-new-upstream-tarball 2.0
 
 : 'make branch names more conventional'
 git branch -D master
@@ -63,9 +60,8 @@ gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+t-dch-commit -r sid
 
 t-archive-none $p
 t-git-none