test suite: gdr-edits: Rely on dgit interop, and test that it DTRT

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 08717dd413c113cfc7eca638c2a85058de3b3b89..9eb75371102f14e4648f8bef5d12f0d907c462db 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -47,6 +47,7 @@ t-gdr-good () {
                ;;
        stitched)       etypes=Pseudomerge-Upstream ;;
        pushed)         etypes=AddPatches-Pseudomerge-Upstream ;;
+       pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
        esac
 
        t-git-debrebase analyse >../anal.check
@@ -68,6 +69,7 @@ t-gdr-good () {
                Packaging/SAME)                         ;;
                Packaging/Upstream)                     ;;
                AddPatches/SAME)                        ;;
+               AddPatches/AddPatchesInterop)           ;;
                Changelog/Packaging)                    ;;
                Changelog/Upstream)                     ;;
                Upstream/SAME)                          ;;
@@ -87,6 +89,13 @@ t-gdr-good () {
                        fi
                esac
 
+               case "$cetype" in
+               AddPatchesInterop)
+                       git log -n1 --pretty=format:%B \
+                       | grep '^\[git-debrebase[ :]'
+                       ;;
+               esac
+
                case "$ctype" in
                Pseudomerge)
                        expect=${info#Contributor=}

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 45a3f20c25e4fe670730a09b0fbeb0a6847adcdb..a23c2f0897154c9729da049d0f2b4447b9f70caa 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -23,18 +23,15 @@ git tag t.before
 t-git-debrebase
 t-gdr-good laundered
 
-t-git-debrebase stitch --prose=wombat
-t-gdr-good stitched
-
 t-dgit push-source
-t-gdr-good pushed
+t-gdr-good pushed-interop
 
 git branch before-noop
 
 t-git-next-date
 t-git-debrebase
 t-git-debrebase stitch
-t-gdr-good pushed
+t-gdr-good pushed-interop
 
 t-refs-same-start
 t-ref-same refs/heads/before-noop