exit status: Fix git-debrebase to use Debian::Dgit::ExitStatus

[dgit.git] / tests / tests / gdr-subcommands

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index f6d817d88eb3a37b367c411a39ac709e1df113f0..9d50b6c04f7db9134b4752ae1565854577be6bcc 100755 (executable)
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -12,10 +12,15 @@ t-dgit setup-mergechangelogs
 
 mix-it () {
        t-git-next-date
+
        local m=$(git symbolic-ref HEAD)
        t-some-changes "subcommands $m 1"
+
        t-dgit -wgf quilt-fixup
+       t-git-next-date
+
        t-some-changes "subcommands $m 2"
+       t-git-next-date
 }
 
 git checkout -b stitched-laundered master
@@ -59,6 +64,9 @@ subcmd () {
                git branch $before
 
                case "$checkletters" in
+               XX*)
+                       fail "$checkletters" # for debugging
+                       ;;
                N*)
                        t-expect-fail E:. \
                        t-git-debrebase $subcmd
@@ -130,7 +138,7 @@ make_check () {
                git reset --hard HEAD^1
                ;;
        P*)
-               t-dgit -wgf --quilt=check quilt-fixup
+               t-dgit -wgf --quilt=nofix quilt-fixup
                git diff HEAD~ debian/patches | egrep .
                git diff --quiet HEAD~ -- ':.' ':!debian/patches'
                git reset --hard HEAD~
@@ -145,10 +153,14 @@ make_check () {
        f*)
                t-has-ancestor HEAD refs/heads/$before
                ;;
+       *)
+               fail "$1"
+               ;;
        esac
 }
 
 Ec="F:No ongoing git-debrebase session"
+Ep="F:Patch export produced patch amendments"
 
 # input state:
 #  stitched?           st'd    st'd    unst'd  unst'd
@@ -160,11 +172,11 @@ Ec="F:No ongoing git-debrebase session"
 #
 subcmd ''              Ult     Ull     Vlt     Vl
 subcmd stitch          Ns      Nu      Sltf    Stf
-#subcmd        pre-push        Ns      Nu      Sltf    Stf
+subcmd prepush         Ns      Nu      Sltf    Stf
 subcmd quick           ns      Sl      Sltf    Sl
 subcmd conclude        "$Ec"   "$Ec"   Sltf    Sl
-#subcmd        make-patches    sPft    sPft    uPft    uPft
-#subcmd        dgit-upload-hook Psft   Psft    SPft    SPft
+subcmd make-patches    sPft    "$Ep"   uPft    "$Ep"
+#subcmd        dgit-upload-hook Psft   "$Ep"   SPft    "$Ep"
 #
 # result codes, each one is a check:
 #   E:$pat     } this is an error (must come first)