git-debrebase: test suite: introduce t-some-changes

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 3cbc43a8ac56ef6f853c7b57d5edf74cd97e1236..2dbb51548af5f928efd2d9e08ff79695494ae7e4 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -8,8 +8,7 @@ t-dependencies git-buildpackage libfile-fnmatch-perl
 t-tstunt-parsechangelog
 
 not-gdr-processable () {
-       t-expect-fail F:'Cannot cope with this commit' \
-       t-git-debrebase
+       t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
 p=example
@@ -64,9 +63,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
@@ -84,7 +82,8 @@ git push --set-upstream origin master
 
 t-git-debrebase -fupstream-has-debian gbp2debrebase
 
-dch -v 2.0-2 -m 'switch to git-debrebase, no other changes'
+v=2.0-2
+dch -v $v -m 'switch to git-debrebase, no other changes'
 dch -r sid
 git commit -m changelog debian/changelog
 
@@ -92,6 +91,9 @@ t-dgit -wgf push-source --new --overwrite
 git push
 
 cd ..
+
+t-archive-process-incoming sid
+
 t-setup-done '' "$(echo $p*) git mirror salsa aq" '
        . $troot/lib-gdr
        t-tstunt-parsechangelog