summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/kadm5/unit-test/ChangeLog5
-rw-r--r--src/lib/kadm5/unit-test/api.0/init.exp4
-rw-r--r--src/lib/kadm5/unit-test/api.2/init.exp4
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index aba10a90e9..0f95d81387 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 9 15:57:55 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * api.0/init.exp, api.2/init.exp: use spawn/expect instead of exec
+ so tests don't fail when kadmin.local produces output
+
Mon Nov 11 20:51:27 1996 Tom Yu <tlyu@mit.edu>
* configure.in: Add AC_CANONICAL_HOST to deal with new pre.in.
diff --git a/src/lib/kadm5/unit-test/api.0/init.exp b/src/lib/kadm5/unit-test/api.0/init.exp
index eec097ea15..594b62f446 100644
--- a/src/lib/kadm5/unit-test/api.0/init.exp
+++ b/src/lib/kadm5/unit-test/api.0/init.exp
@@ -699,7 +699,9 @@ proc test45_46 {service} {
server_handle}] "SECURE_PRINC_MISSING"
# this leaves the keytab with an incorrect entry
- exec $kadmin_local -q "ank -randkey $service"
+ spawn $kadmin_local -q "ank -randkey $service"
+ expect eof
+ wait
# restart the api so it gets a new ccache
api_exit
diff --git a/src/lib/kadm5/unit-test/api.2/init.exp b/src/lib/kadm5/unit-test/api.2/init.exp
index 79efcee150..86d07389bc 100644
--- a/src/lib/kadm5/unit-test/api.2/init.exp
+++ b/src/lib/kadm5/unit-test/api.2/init.exp
@@ -703,7 +703,9 @@ proc test45_46 {service} {
server_handle}] "SECURE_PRINC_MISSING"
# this leaves the keytab with an incorrect entry
- exec $kadmin_local -q "ank -randkey $service"
+ spawn $kadmin_local -q "ank -randkey $service"
+ expect eof
+ wait
# restart the api so it gets a new ccache
api_exit