* 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

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 55293c4137bb2af96443c421d3c3232f0a3a4ff9..9455a29d85b81747673398d9a5ef6d1d2f8a25d3 100644 (file)
--- 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 1692aa7c27f7a68e3ed6f3559f1b9b8cc5c6f7c9..79f5d944a12886e88a4298a637e6d7b197084309 100644 (file)
--- 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 4962bc2f8fc080f96a0c31efe63889f801d18f56..a8b6ca670cd3dece7daf2d4a9d5826da60e91640 100644 (file)
--- 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$"  {}