From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 24 Aug 2018 21:29:33 +0000 (+0100)
Subject: test-suite: lib-gdr: Be more defensive about unexpected states/args
X-Git-Tag: archive/debian/6.10~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=626c5a5851ebabb54e01e3fe3e15b3971f62555b

test-suite: lib-gdr: Be more defensive about unexpected states/args

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index bda2679a..9ea5af51 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -25,10 +25,10 @@ t-gdr-good () {
 
 	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 +57,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