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

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index bda2679ab235468a0a0f2b99be1e122249acdb70..9ea5af51bcacbbe1f885d0535bdb02339183b6f3 100644 (file)
--- 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