aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-04-03 01:43:36 +0000
committerKen Raeburn <raeburn@mit.edu>2004-04-03 01:43:36 +0000
commitdc39d9ba23e7439e288647339d36a195dfe08dab (patch)
tree46ad3689d869461fa137bd966a0c6df0d5b72d2e
parentcd05ce3997c338cbe4fc79b8c81462ba941caee9 (diff)
downloadkrb5-dc39d9ba23e7439e288647339d36a195dfe08dab.zip
krb5-dc39d9ba23e7439e288647339d36a195dfe08dab.tar.gz
krb5-dc39d9ba23e7439e288647339d36a195dfe08dab.tar.bz2
* 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
-rw-r--r--src/lib/rpc/unit-test/ChangeLog5
-rw-r--r--src/lib/rpc/unit-test/lib/helpers.exp1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index b5f3d68..c36b4dc 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 c76ced1..b69be5b 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 }