diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/rpc/unit-test/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/lib/helpers.exp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index e565321f27..1d6c648b76 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,9 @@ +2003-12-02 Ken Raeburn <raeburn@mit.edu> + + * lib/helpers.exp (expect_kadm_ok, eof_client): Accept and ignore + debugging messages starting "marshall_new_creds" or "gssapi_", and + blank lines. + 2003-01-07 Ken Raeburn <raeburn@mit.edu> * Makefile.ov: Deleted. diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp index 54e0ef4301..c1d691e67f 100644 --- a/src/lib/rpc/unit-test/lib/helpers.exp +++ b/src/lib/rpc/unit-test/lib/helpers.exp @@ -51,6 +51,9 @@ proc expect_kadm_ok {} { expect { -i $kadmin_tcl_spawn_id -re "^OK OVSEC_KADM_OK \[^\n\]*\n" {} + -re "^marshall_new_creds: \[^\n\]*\n" { exp_continue } + -re "^gssapi_\[^\n\]*\n" { exp_continue } + -re "^\r?\n" { exp_continue } default { perror "didn't get ok back" } } } @@ -190,6 +193,9 @@ proc eof_client {testname ccname id status} { expect { -i $id + -re "^marshall_new_creds\[^\n\]*\n" { exp_continue } + -re "^gssapi_\[^\n\]*\n" { exp_continue } + -re "^\r?\n" { exp_continue } eof { verbose $expect_out(buffer) 1 } timeout { fail "$testname: timeout waiting for client $ccname to exit" |