test suite: git-debrebase: provide GDR "macro" for dependencies

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

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index d988321071e1aad4f40b187cea67e8078bff07d5..e59fc07aaeab6ada1e0a510e3be9ff8b3027d299 100755 (executable)
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 
@@ -16,7 +16,8 @@ mix-it () {
        local m=$(git symbolic-ref HEAD)
        t-some-changes "subcommands $m 1"
 
-       t-dgit -wgf quilt-fixup
+       # we want patches mde by dgit, not gdr, for our test cases
+       t-dgit --git-debrebase=true -wgf quilt-fixup
        t-git-next-date
 
        t-some-changes "subcommands $m 2"
@@ -63,22 +64,40 @@ subcmd () {
                before=before-$work
                git branch $before
 
+               local xopts=''
+
                case "$checkletters" in
                XX*)
                        fail "$checkletters" # for debugging
                        ;;
+               esac
+
+               case "$checkletters" in
+               X*)
+                       t-expect-fail E:'snags: [0-9]* blockers' \
+                       t-git-debrebase $xopts $subcmd
+                       xopts+=' --force'
+                       next_checkletter
+                       ;;
+               esac
+
+               case "$checkletters" in
                N*)
                        t-expect-fail E:. \
-                       t-git-debrebase $subcmd
-                       t-git-debrebase --noop-ok $subcmd
+                       t-git-debrebase $xopts $subcmd
+                       xopts+=' --noop-ok'
+                       next_checkletter
                        ;;
+               esac
+
+               case "$checkletters" in
                [EF]:*)
                        t-expect-fail "$checkletters" \
-                       t-git-debrebase $subcmd
+                       t-git-debrebase $xopts $subcmd
                        continue
                        ;;
                *)
-                       t-git-debrebase $subcmd
+                       t-git-debrebase $xopts $subcmd
                        ;;
                esac
 
@@ -182,6 +201,7 @@ subcmd      make-patches    sPft    "$Ep"   uPft    "$Ep"
 #   E:$pat     } this is an error (must come first)
 #   F:$pat     } arg is passed to expect-fail
 #
+#   X          should fail due to snags, but succeed when forced
 #   XX         crash out of script for manual debugging
 #
 #   N          this is a noop, error unless --noop-ok