From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jun 2018 11:21:55 +0000 (+0100)
Subject: test suite: gdr-edits: Rely on dgit interop, and test that it DTRT
X-Git-Tag: archive/debian/5.0~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=37caf544c8c2f8a69e673c2b2ec4fee885d53a0f;ds=inline

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 08717dd4..9eb75371 100644
--- 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 45a3f20c..a23c2f08 100755
--- 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