Merge branch 'wip.tutorials' into wip

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

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index ac8a42651b4abb0201c25895c785f466748928d5..38d2489b21bf43d242e06e1119303d3f73e93e25 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -4,39 +4,47 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-newtag
-
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 
-t-dgit --quilt=gbp 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 --dgit-view-save=split.b1 build-source
+git rev-parse split.b1
 
-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 build-source
-
-t-expect-fail 'specifies a different tree to your HEAD commit' \
-  t-dgit push
+t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source
 
-test-push () {
+test-push-1 () {
        t-refs-same-start
        t-ref-head
+}
 
-       t-dgit --quilt=gbp push
+test-push-2 () {
+       t-dgit --quilt=gbp --dgit-view-save=split.p push
 
        t-gbp-pushed-good
 }
 
-test-push
+test-push-1
+
+t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
+
+t-expect-fail "HEAD specifies a different tree to $p" \
+  t-dgit push
+
+test-push-2
 
 echo wombat >>debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
@@ -44,8 +52,10 @@ git commit -m 'Pointless 2'
 
 t-commit 'Check pseudomerge' 1.0-3
 
-t-dgit --quilt=gbp --clean=git build-source
+test-push-1
+
+t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
 
-test-push
+test-push-2
 
 echo ok.