This commit was manufactured by cvs2svn to create tag

[krb5.git] / src / lib / kadm5 / unit-test / api.0 / init.exp

diff --git a/src/lib/kadm5/unit-test/api.0/init.exp b/src/lib/kadm5/unit-test/api.0/init.exp
index 62b1bde357ab8b16a34d1706b7a497285668d715..d39ecce07dd125b0f4806c9872cc4750d54877a0 100644 (file)
--- a/src/lib/kadm5/unit-test/api.0/init.exp
+++ b/src/lib/kadm5/unit-test/api.0/init.exp
@@ -77,7 +77,7 @@ proc test6 {} {
     send "ovsec_kadm_init admin null \$OVSEC_KADM_ADMIN_SERVICE null \$OVSEC_KADM_STRUCT_VERSION \$OVSEC_KADM_API_VERSION_1 server_handle\n"
 
     expect {
-       {Enter password:} { }
+       -re "assword\[^\r\n\]*: *" { }
        eof {
                fail "$test: eof instead of password prompt"
                api_exit
@@ -103,8 +103,8 @@ proc test7 {} {
     send "ovsec_kadm_init admin \"\" \$OVSEC_KADM_ADMIN_SERVICE null \$OVSEC_KADM_STRUCT_VERSION \$OVSEC_KADM_API_VERSION_1 server_handle\n"
 
     expect {
-       {Enter password:} { }
-       -re "key:$" { }
+       -re "assword\[^\r\n\]*: *" { }
+       -re "\n\[^\n\]+key:\[^\n\]*$" { }
        eof {
                fail "$test: eof instead of password prompt"
                api_exit
@@ -338,7 +338,7 @@ proc test22 {} {
        }]
        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" }
@@ -363,7 +363,7 @@ proc test225 {} {
        }]
        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" }