summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBarry Jaspan <bjaspan@mit.edu>1996-11-06 23:18:20 +0000
committerBarry Jaspan <bjaspan@mit.edu>1996-11-06 23:18:20 +0000
commit3c2de21af55246243f56f3fde69b902e81471aef (patch)
tree17247503991937803f16d966cf1f45da67c96cd1 /src
parent3f6476c0308d9993e6d33993c4c36c25d3ac9ab4 (diff)
downloadkrb5-3c2de21af55246243f56f3fde69b902e81471aef.tar.gz
krb5-3c2de21af55246243f56f3fde69b902e81471aef.tar.xz
krb5-3c2de21af55246243f56f3fde69b902e81471aef.zip
* lib/lib.t: global $test everywhere it is used
* api.2/mod-principal-v2.exp: init to kadmin/admin, not kadmin/changepw; specify real principal, not null (obviously I never ran these tests via the client library before) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9308 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/kadm5/unit-test/ChangeLog8
-rw-r--r--src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp26
-rw-r--r--src/lib/kadm5/unit-test/lib/lib.t8
3 files changed, 24 insertions, 18 deletions
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 55293c413..9455a29d8 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 6 17:48:49 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * lib/lib.t: global $test everywhere it is used
+
+ * api.2/mod-principal-v2.exp: init to kadmin/admin, not
+ kadmin/changepw; specify real principal, not null (obviously I
+ never ran these tests via the client library before)
+
Fri Nov 1 13:15:37 1996 Barry Jaspan <bjaspan@mit.edu>
* api.2/get-principal-v2.exp, api.2/mod-principal-v2.exp: update
diff --git a/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp b/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
index 1692aa7c2..79f5d944a 100644
--- a/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
@@ -14,7 +14,7 @@ proc test100_104 {} {
}
if {! [cmd {
- kadm5_init admin admin $KADM5_CHANGEPW_SERVICE null \
+ kadm5_init admin admin $KADM5_ADMIN_SERVICE null \
$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
server_handle
}]} {
@@ -29,25 +29,25 @@ proc test100_104 {} {
} $test]
# test 101
- one_line_fail_test {
- kadm5_modify_principal $server_handle null \
+ one_line_fail_test [format {
+ kadm5_modify_principal $server_handle [simple_principal "%s/a"] \
{KADM5_LAST_SUCCESS}
- } "BAD_MASK"
+ } $test] "BAD_MASK"
# test 102
- one_line_fail_test {
- kadm5_modify_principal $server_handle null \
+ one_line_fail_test [format {
+ kadm5_modify_principal $server_handle [simple_principal "%s/a"] \
{KADM5_LAST_FAILED}
- } "BAD_MASK"
+ } $test] "BAD_MASK"
# test 103
- one_line_fail_test {
- kadm5_modify_principal $server_handle null \
+ one_line_fail_test [format {
+ kadm5_modify_principal $server_handle [simple_principal "%s/a"] \
{KADM5_FAIL_AUTH_COUNT}
- } "BAD_MASK"
+ } $test] "BAD_MASK"
# test 103.5
- one_line_fail_test {
- kadm5_modify_principal $server_handle null \
+ one_line_fail_test [format {
+ kadm5_modify_principal $server_handle [simple_principal "%s/a"] \
{KADM5_KEY_DATA}
- } "BAD_MASK"
+ } $test] "BAD_MASK"
# test 105
one_line_fail_test [format {
diff --git a/src/lib/kadm5/unit-test/lib/lib.t b/src/lib/kadm5/unit-test/lib/lib.t
index 4962bc2f8..a8b6ca670 100644
--- a/src/lib/kadm5/unit-test/lib/lib.t
+++ b/src/lib/kadm5/unit-test/lib/lib.t
@@ -12,7 +12,7 @@ set lib_pid 0
# case.
#
proc lib_start_api {} {
- global spawn_id lib_pid
+ global spawn_id lib_pid test
if {! [api_isrunning $lib_pid]} {
api_exit
@@ -47,8 +47,7 @@ proc cmd {command} {
}
proc tcl_cmd {command} {
- global prompt
- global spawn_id
+ global prompt spawn_id test
send "[string trim $command]\n"
expect {
@@ -108,8 +107,7 @@ proc one_line_fail_test_nochk {command} {
}
proc resync {} {
- global prompt
- global spawn_id
+ global prompt spawn_id test
expect {
-re "$prompt$" {}