* 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 b5f3d68beb22d2d6c1d98bb53c51f40013cff171..c36b4dcfd08b4b7885b567df55ef2e1306db95c1 100644 (file)
--- 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 c76ced1d040a095f6c00afce7de589dbddf52a20..b69be5b6bb49ca3e9479d223702e323e640ebf7a 100644 (file)
--- 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 }