dgit: HEAD/.dsc mismatch error: Much better message

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

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index d3624e9ee6f5183350b10a586c3beab2724513b1..fe68222c149d74fc42a7fa973870249eb2352687 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -2,45 +2,53 @@
 set -e
 . tests/lib
 
+t-tstunt-parsechangelog
+
 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-expect-fail "HEAD specifies a different tree to $p" \
   t-dgit push
 
-exit 0
+test-push () {
+       t-refs-same-start
+       t-ref-head
 
-===
+       t-dgit --quilt=gbp push
 
-want to
+       t-gbp-pushed-good
+}
 
- do push
- t-pushed-good
- check that
-   - we didn't update caller's branch
+test-push
 
- do fetch
- check that this didn't update dgit remote ref
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
+t-commit 'Check pseudomerge' 1.0-3
+
+t-dgit --quilt=gbp --clean=git build-source
 
- check that that tree
-  - has patches applied (reuse rules build magic)
-  - has .gitignore edited
+test-push
 
+echo ok.