summaryrefslogtreecommitdiffstats
path: root/src/tests/gssapi
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-04-26 04:33:48 +0000
committerGreg Hudson <ghudson@mit.edu>2012-04-26 04:33:48 +0000
commitd85fbcebd2d4880972e8565a3d5aba492ef59431 (patch)
tree2eea96479aea9dcc09d1545caa8f6a046a26d56f /src/tests/gssapi
parent60ccf0f7dc305b89179df2454b95a021fbcb09cb (diff)
downloadkrb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.tar.gz
krb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.tar.xz
krb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.zip
Flip the default of start_kadmind in k5test.py
Very few Python tests need kadmind, so it makes more sense to have to turn it on than to have to turn it off. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25825 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/gssapi')
-rw-r--r--src/tests/gssapi/t_ccselect.py6
-rw-r--r--src/tests/gssapi/t_gssapi.py4
-rw-r--r--src/tests/gssapi/t_s4u.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tests/gssapi/t_ccselect.py b/src/tests/gssapi/t_ccselect.py
index 0d36d7a350..a3a1330d6a 100644
--- a/src/tests/gssapi/t_ccselect.py
+++ b/src/tests/gssapi/t_ccselect.py
@@ -24,9 +24,9 @@
from k5test import *
# Create two independent realms (no cross-realm TGTs).
-r1 = K5Realm(start_kadmind=False, create_user=False)
-r2 = K5Realm(start_kadmind=False, create_user=False, realm='KRBTEST2.COM',
- testdir=os.path.join(r1.testdir, 'r2'), portbase=62000)
+r1 = K5Realm(create_user=False)
+r2 = K5Realm(create_user=False, realm='KRBTEST2.COM', portbase=62000,
+ testdir=os.path.join(r1.testdir, 'r2'))
# gsserver specifies the target as a GSS name. The resulting
# principal will have the host-based type, but the realm won't be
diff --git a/src/tests/gssapi/t_gssapi.py b/src/tests/gssapi/t_gssapi.py
index e640e0231d..3ace215db8 100644
--- a/src/tests/gssapi/t_gssapi.py
+++ b/src/tests/gssapi/t_gssapi.py
@@ -7,7 +7,7 @@ for realm in multipass_realms():
### Test acceptor name behavior.
-realm = K5Realm(start_kadmind=False)
+realm = K5Realm()
# Create some host-based principals and put most of them into the
# keytab. Rename one principal so that the keytab name matches the
@@ -84,7 +84,7 @@ realm.stop()
# and the principal for the mismatching hostname in the keytab.
ignore_conf = { 'all' : { 'libdefaults' : {
'ignore_acceptor_hostname' : 'true' } } }
-realm = K5Realm(krb5_conf=ignore_conf, start_kadmind=False)
+realm = K5Realm(krb5_conf=ignore_conf)
realm.run_kadminl('addprinc -randkey host/-nomatch-')
realm.run_kadminl('xst host/-nomatch-')
output = realm.run_as_client(['./t_accname', 'host/-nomatch-',
diff --git a/src/tests/gssapi/t_s4u.py b/src/tests/gssapi/t_s4u.py
index bd958f9f40..4c68c961a4 100644
--- a/src/tests/gssapi/t_s4u.py
+++ b/src/tests/gssapi/t_s4u.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
from k5test import *
-realm = K5Realm(start_kadmind=False, create_host=False, get_creds=False)
+realm = K5Realm(create_host=False, get_creds=False)
usercache = 'FILE:' + os.path.join(realm.testdir, 'usercache')
storagecache = 'FILE:' + os.path.join(realm.testdir, 'save')