From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 3 Apr 2004 01:43:36 +0000 (+0000)
Subject: * lib/helpers.exp (expect_kadm_ok): Check for "ERROR" messages and report them
X-Git-Tag: krb5-1.4-beta1~502
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc39d9ba23e7439e288647339d36a195dfe08dab;p=krb5.git

* lib/helpers.exp (expect_kadm_ok): Check for "ERROR" messages and report them

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16232 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index b5f3d68be..c36b4dcfd 100644
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-02  Ken Raeburn  <raeburn@mit.edu>
+
+	* lib/helpers.exp (expect_kadm_ok): Check for "ERROR" messages and
+	report them.
+
 2004-02-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* lib/helpers.exp (expect_kadm_ok): Check for eof and report a
diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp
index c76ced1d0..b69be5b6b 100644
--- a/src/lib/rpc/unit-test/lib/helpers.exp
+++ b/src/lib/rpc/unit-test/lib/helpers.exp
@@ -51,6 +51,7 @@ proc expect_kadm_ok {} {
     expect {
 	-i $kadmin_tcl_spawn_id
 	-re "^OK OVSEC_KADM_OK \[^\n\]*\n" {}
+	-re "^ERROR \[^\n\]*\n" { perror "kadmin tcl subprocess reported unexpected error" }
 	-re "^marshall_new_creds: \[^\n\]*\n" { exp_continue }
 	-re "^gssapi_\[^\n\]*\n" { exp_continue }
 	-re "^\r?\n" { exp_continue }