git-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index ddb0d031b756c941f2d168bec2b48de1410630ae..7608a12987c190cc37ba50a4cad0288043d51bb8 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
@@ -48,6 +47,16 @@ git archive -o ../$ust --prefix=example-2.0/ make-upstream
 git branch -D master
 git branch -m quilt-tip master
 
+for b in \
+               quilt-tip-2             \
+               gitish-only             \
+               quilt-tip-1.1           \
+               patch-queue/quilt-tip   \
+               indep-arch              \
+; do
+       git branch -D $b
+done
+
 : 'see what gbp import-orig does'
 git checkout master
 gbp import-orig --upstream-version=2.0 ../$ust
@@ -74,11 +83,22 @@ 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
 
 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
+       p=example
+'
+
 t-ok