From fd60a31ac3b7308570eee56f1e3c8e5ef0ffafe1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 09:13:55 +0100
Subject: [PATCH] test suite: gdr-unprocessable: new test

Test git-debrebase messages about unprocessable commits.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog              |  1 +
 debian/tests/control          |  2 +-
 tests/tests/gdr-unprocessable | 60 +++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100755 tests/tests/gdr-unprocessable

diff --git a/debian/changelog b/debian/changelog
index be2d3495..41026cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dgit (6.3~) unstable; urgency=medium
     commits.  Closes:#905003.
   * git-debrebase: new-upstream: Fix error message for new version
     with bad syntax.
+  * git-debrebase test suite: Test messages about unprocessable commits.
 
  --
 
diff --git a/debian/tests/control b/debian/tests/control
index 84806550..8f7fd7d2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands gdr-unprocessable
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 
diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable
new file mode 100755
index 00000000..caa5321f
--- /dev/null
+++ b/tests/tests/gdr-unprocessable
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-dependencies GDR
+
+t-setup-import gdr-convert-gbp
+
+cd $p
+
+t-dgit setup-mergechangelogs
+
+subcmd () {
+	cmd=("$@")
+
+	branch merge 'complex merge'
+	branch origin 'origin commit'
+}
+
+branch () {
+	branch=$1
+	git checkout gdr-unprocessable/$branch
+	msgcore=$2
+	expected-$expected
+}
+
+cmd () {
+	t-git-debrebase "${cmd[@]}"
+}
+
+expected- () {
+	t-expect-fail E:"$(printf "$mfmt" "$msgcore")" \
+	cmd
+}
+
+expected-ok () {
+	f=../out.$branch."${cmd/[^-a-zA-Z//_}"
+	cmd | tee $f
+	for mfmt in "${mfmts[@]}"; do
+		grep "$(printf "$mfmt" "$msgcore")" $f
+	done
+}
+
+mfmt='found unprocessable commit.*%s'
+subcmd
+subcmd quick
+subcmd new-upstream 2.0 upstream/2.0
+subcmd make-patches
+subcmd breakwater
+subcmd anchor
+
+expected=ok
+mfmts=(' Unprocessable (%s)')
+subcmd analyse
+
+mfmts=('branch not in git-debrebase form'
+	'found unprocessable commit, cannot cope: %s')
+subcmd status
+
+t-ok
-- 
2.30.2