gbp options: Honour --gbp-pq instead of --gbp

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

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 271ea2c71c1b34ab9064c57fdfd104e963795db2..23083a7667d4144d6b271de106cf86149d38dd52 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -9,55 +9,46 @@ 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
 
 t-expect-fail 'specifies a different tree to your HEAD commit' \
   t-dgit push
 
-t-refs-same-start
-t-ref-head
-
-t-dgit --quilt=gbp push
-
-t-ref-head
+test-push () {
+       t-refs-same-start
+       t-ref-head
 
-exit 0
+       t-dgit --quilt=gbp push
 
-===
+       t-gbp-pushed-good
+}
 
-want to
+test-push
 
- t-pushed-good XXX need to do something more subtle than check our branch is in repo now:
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
-    # check that:
-    # working tree is still clean
-    # DEP-14 tag refers to our HEAD, unchanged
-    # New dgit tag refers to a descendant
-    # New dgit tag and archive tag and .dsc hash are same
-    # dgit tree can be made by
-    #    - dpkg-source -x on the pushed .dsc
-    #    - modulo .pc
-    # Maintainer tree can be made by
-    #    - dpkg-source -x --skip-patches on the pushed .dsc
-    #    - deleting any auto-gitignore patch and removing it from series
-    #    - modulo .pc
-    # dgit tree can be made by
-    #    - as above, and then dpkg-source --before-build
-    #    - modulo .pc and non-debian/ .gitignores
+t-commit 'Check pseudomerge' 1.0-3
 
-make a new change
+t-dgit --quilt=gbp --clean=git build-source
 
-push it
+test-push
 
-check that the synthetic fast forward worked
+echo ok.