summaryrefslogtreecommitdiffstats
path: root/src/lib/kadm5/unit-test/api.2
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2002-10-19 01:22:31 +0000
committerTom Yu <tlyu@mit.edu>2002-10-19 01:22:31 +0000
commitfcbd19fa1eab345d7ca5a97a2a8d2e63c6e60d26 (patch)
tree38832f37ddb6fd53eba0b22f5bc7d18e5f5f50b8 /src/lib/kadm5/unit-test/api.2
parent4824c17e6a983c7e1335b500f4bf3e6849af6adf (diff)
This commit fixes the test suite aspects. Callers of the various
read_password functions still need to be updated. * api.2/init-v2.exp (test106): Make regexp more forgiving of variant password prompts. * api.0/init.exp (test7, test22, test225): Make regexp more forgiving of variant password prompts. ticket: 1217 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14932 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/unit-test/api.2')
-rw-r--r--src/lib/kadm5/unit-test/api.2/init-v2.exp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/kadm5/unit-test/api.2/init-v2.exp b/src/lib/kadm5/unit-test/api.2/init-v2.exp
index 11eac5b45..0e3359b19 100644
--- a/src/lib/kadm5/unit-test/api.2/init-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/init-v2.exp
@@ -112,7 +112,8 @@ if {! $RPC} test103
test "init 106"
proc test106 {} {
global test prompt
-
+
+ set prompting 0
send [string trim {
kadm5_init admin admin $KADM5_ADMIN_SERVICE \
[config_params {KADM5_CONFIG_MKEY_FROM_KBD} 1] \
@@ -121,7 +122,7 @@ proc test106 {} {
}]
send "\n"
expect {
- -re ":$" { set prompting 1}
+ -re "\n\[^\n\]+:\[^\n\]*$" { set prompting 1}
-re "\nOK .*$prompt$" { fail "$test: premature success" }
-re "\nERROR .*$prompt$" { fail "$test: premature failure" }
timeout { fail "$test: timeout" }