aboutsummaryrefslogtreecommitdiff
path: root/src/tests/gssapi/t_s4u.py
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2015-01-31 00:29:59 -0500
committerGreg Hudson <ghudson@mit.edu>2015-02-19 11:57:18 -0500
commit60516bb111ac68ce0d809043d46c0c1f815a7b30 (patch)
tree427f0e6c1645d79401ac5c65100ae6d98f82c43d /src/tests/gssapi/t_s4u.py
parent040fe97758bdf53b6c00815b0306410eb88ea5ec (diff)
downloadkrb5-60516bb111ac68ce0d809043d46c0c1f815a7b30.zip
krb5-60516bb111ac68ce0d809043d46c0c1f815a7b30.tar.gz
krb5-60516bb111ac68ce0d809043d46c0c1f815a7b30.tar.bz2
Use kadmin script mode in Python tests
In k5test, rename kadmin_local to kadminl and remove the run_kadminl() K5Realm method. Update all scripts to use realm.run([kadminl, 'cmd', ...]). run_kadmin() still exists but takes an argument array instead of a query string. Where we touch test code, rename "output" to "out" (since "output" is a function name exported by k5test.py), elide ":normal" from salt strings, and use expressions like realm.krbtgt_princ instead of manually composed principal names where appropriate. In t_kadmin_acl.py, get rid of the delprinc() helper since the equivalent is now concise enough to be written out each time. In t_policy.py, remove some inoperative getprinc invocations and reorder some tests which didn't correspond to their comment headers.
Diffstat (limited to 'src/tests/gssapi/t_s4u.py')
-rw-r--r--src/tests/gssapi/t_s4u.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/gssapi/t_s4u.py b/src/tests/gssapi/t_s4u.py
index e4aa259..0e38429 100644
--- a/src/tests/gssapi/t_s4u.py
+++ b/src/tests/gssapi/t_s4u.py
@@ -60,7 +60,7 @@ if ('Warning: no delegated cred handle' not in output or
# Correct that problem and try again. As above, the S4U2Proxy step
# won't actually succeed since we don't support that in DB2.
-realm.run_kadminl('modprinc +ok_to_auth_as_delegate ' + service1)
+realm.run([kadminl, 'modprinc', '+ok_to_auth_as_delegate', service1])
output = realm.run(['./t_s4u', puser, pservice2], expected_code=1)
if 'NOT_ALLOWED_TO_DELEGATE' not in output:
fail('s4u2self')