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 9d9fcb461a09025a173f8dc8d23af0b5ee2a8fc5..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
@@ -329,3 +336,42 @@ t-gdr-prep-new-upstream () {
        git checkout master
        t-git-next-date
 }
+
+t-gdr-gbp-import-core () {
+       p=example
+       t-worktree 1.1
+
+       cd example
+
+       : 'fake up some kind of upstream'
+       git checkout -b upstream quilt-tip
+       rm -rf debian
+       mkdir debian
+       echo junk >debian/rules
+       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
+       git merge --no-edit -s ours upstream
+
+       : 'fake up that our quilt-tip had the patch queue in it'
+       git checkout patch-queue/quilt-tip
+       gbp pq export
+       git add debian/patches
+       git commit -m "patch queue update ($0)"
+
+       : 'make branch names more conventional'
+       git branch -D master
+       git branch -m quilt-tip master
+}
+
+t-gdr-made-patches () {
+       git log -n1 --'pretty=format:%B' \
+       | egrep '^\[git-debrebase'
+}