git-debrebase: merge: test suite: Drop check of no wreckage save

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

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 134d243893a0c56b7426267b22894adbe17ff170..6886cf89652d6a222b0eb3b38aa36df58581af3d 100755 (executable)
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -2,6 +2,8 @@
 set -e
 . tests/lib
 
+suitespecs+=' stable'
+
 # This test script tests each of the split brain quilt modes, and
 # --quilt=linear, with a tree suitable for each of those, and pushes
 # them in sequence.  The idea is to check that each tree is rejected
@@ -21,20 +23,18 @@ suite=sid
 
 want-success () {
        local qmode=$1; shift
-       t-dgit "$@" --quilt=$qmode build-source
-
        t-refs-same-start
        t-ref-head
-       t-dgit "$@" --quilt=$qmode push
+
+       t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
+
+       t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
        t-$qmode-pushed-good
 }
 
 
 echo "===== testing tree suitable for --quilt=gbp (only) ====="
 
-t-expect-fail 'grep: new-upstream-file: No such file or directory' \
-t-dgit --quilt=dpm build-source
-
 t-expect-fail 'git tree differs from result of applying' \
 t-dgit -wgf --quilt=dpm build-source
 
@@ -129,5 +129,9 @@ t-dgit -wgf build-source
 
 want-success dpm
 
+suite=stable
+t-commit dpmish-stable 1.0-6 $suite
+
+want-success dpm --new
 
-echo ok.
+t-ok