From 5c1d8f7c5e79162798f1b52a385a343b386d48b2 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sun, 5 Mar 2006 22:40:30 +0000 Subject: [PATCH] update tests for mechglue major error strings git-svn-id: svn://anonsvn.mit.edu/krb5/users/tlyu/branches/mechglue@17698 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/rpc/unit-test/ChangeLog | 4 ++++ src/lib/rpc/unit-test/rpc_test.0/expire.exp | 2 +- src/tests/dejagnu/krb-standalone/ChangeLog | 5 +++++ src/tests/dejagnu/krb-standalone/v4gssftp.exp | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index f97c77fc5..23a6a789e 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2006-03-05 Tom Yu + + * rpc_test.0/expire.exp (expired): Update regexp for mechglue. + 2005-08-20 Ken Raeburn * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/rpc/unit-test/rpc_test.0/expire.exp b/src/lib/rpc/unit-test/rpc_test.0/expire.exp index 5c33ffde5..f5841011f 100644 --- a/src/lib/rpc/unit-test/rpc_test.0/expire.exp +++ b/src/lib/rpc/unit-test/rpc_test.0/expire.exp @@ -12,7 +12,7 @@ proc expired {} { expect { -i $server_id - -re "rpc_test server: Authen.*failed: .* referenced credentials have expired" { pass "expired" } + -re "rpc_test server: Authen.*failed:.*credential.*expired" { pass "expired" } timeout { fail "expired: timeout waiting for expired creds error" } } diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 9168ac4c9..c80fa67d5 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,3 +1,8 @@ +2006-03-05 Tom Yu + + * v4gssftp.exp (v4ftp_test): Update "Miscellaneous failure" regexp + for mechglue. + 2005-03-14 Ken Raeburn * v4gssftp.exp: Identify file correctly for top-level error diff --git a/src/tests/dejagnu/krb-standalone/v4gssftp.exp b/src/tests/dejagnu/krb-standalone/v4gssftp.exp index e739e9bd9..6353dc41f 100644 --- a/src/tests/dejagnu/krb-standalone/v4gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/v4gssftp.exp @@ -249,7 +249,7 @@ proc v4ftp_test { } { expect -nocase -re "$localhostname.*ftp server .version \[0-9.\]*. ready." expect -re "Using authentication type GSSAPI; ADAT must follow" expect "GSSAPI accepted as authentication type" - expect "GSSAPI error major: Miscellaneous failure" + expect -re "GSSAPI error major: (Unspecified GSS|Miscellaneous) failure" expect { "GSSAPI error minor: Unsupported credentials cache format version number" {} "GSSAPI error minor: No credentials cache found" {} -- 2.26.2