Test suite: quilt: Provide Gbp-pq headers in our new patch test case

[dgit.git] / tests / tests / quilt-gbp

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 2dc9b420e3bd3ab47ddb2bc46744661e268fa027..23083a7667d4144d6b271de106cf86149d38dd52 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -4,23 +4,26 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-newtag
-
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 
+t-git-config dgit-distro.test-dummy.dgit-tag-format new
+t-expect-fail 'requires split view so server needs to support' \
+t-dgit -wgf --quilt=gbp build-source
+t-newtag
+
 t-dgit --quilt=gbp build-source
 
-t-dgit --quilt=gbp --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source
 
 echo spong >debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m Pointless
 
 t-expect-fail no-such-command-gbp \
-t-dgit --quilt=gbp --clean=git --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source
 
 t-dgit --quilt=gbp --clean=git build-source
 
@@ -42,10 +45,10 @@ echo wombat >>debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m 'Pointless 2'
 
-t-commit 'Check psuedomerge' 1.0-3
+t-commit 'Check pseudomerge' 1.0-3
 
 t-dgit --quilt=gbp --clean=git build-source
 
 test-push
 
-exit 0
+echo ok.