Test suite: Test --new in split brain mode

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

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index fca142200861eec0edde91ec9dd508f5d7fc0b93..89d9fd393abea374916ecc1e31d7b39764ca90b0 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,10 +23,11 @@ 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 build-source
+
        t-dgit "$@" --quilt=$qmode push
        t-$qmode-pushed-good
 }
@@ -58,7 +61,7 @@ Subject: Add .gitignore
 ---
 END
 
-git-diff /dev/null .gitignore >>$pf || test $? = 1
+git diff /dev/null .gitignore >>$pf || test $? = 1
 echo ${pf##*/} >>debian/patches/series
 
 git add debian/patches
@@ -129,5 +132,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.