test suite: Separate t-gdr-gbp-import-core from -with-queue

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index bda2679ab235468a0a0f2b99be1e122249acdb70..e6af12a65945ca5e087ed56aea269ad041cc5843 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -21,14 +21,20 @@ t-gdr-good () {
        #   stitched
        #   pushed
 
+       case $state in
+       pushed*)
+               t-gdr-made-patches
+               ;;
+       esac
+
        git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
        LC_MESSAGES=C t-git-debrebase status >../status.check
        case $state in
-       laundered)
+       laundered*)
                egrep '^  *branch is laundered' ../status.check
                ;;
-       stitched|pushed)
+       stitched*|pushed*)
                egrep \
  '^  *branch contains furniture|^  *branch is unlaundered|^  *branch needs laundering' ../status.check
                egrep '^  stitched$' ../status.check
@@ -57,6 +63,7 @@ t-gdr-good-analyse () {
        pushed)         etypes=AddPatches-Pseudomerge-Upstream ;;
        pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
        breakwater)     etypes=Packaging ;;
+       *)              fail-unknown-state-$state ;;
        esac
 
        anal=../anal$wsfx
@@ -344,6 +351,10 @@ t-gdr-gbp-import-core () {
        git add debian
        git commit -m "an upstream retcon ($0)"
        git tag v1.0
+}
+
+t-gdr-gbp-import-core-with-queue () {
+       t-gdr-gbp-import-core
 
        : 'fake up that our quilt-tip was descended from upstream'
        git checkout quilt-tip
@@ -359,3 +370,8 @@ t-gdr-gbp-import-core () {
        git branch -D master
        git branch -m quilt-tip master
 }
+
+t-gdr-made-patches () {
+       git log -n1 --'pretty=format:%B' \
+       | egrep '^\[git-debrebase'
+}