diff options
author | Greg Hudson <ghudson@mit.edu> | 2012-12-16 16:55:29 -0500 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2012-12-20 11:45:20 -0500 |
commit | 966547dfeb011800d4b78b8e5d494813bc80559c (patch) | |
tree | 4226bd168056336c965a4aa77c845093ef723da3 /src/tests/t_kdb_locking.py | |
parent | 76c27cf7e3161e0f20f8935d82ae0f2feb77b01a (diff) | |
download | krb5-966547dfeb011800d4b78b8e5d494813bc80559c.tar.gz krb5-966547dfeb011800d4b78b8e5d494813bc80559c.tar.xz krb5-966547dfeb011800d4b78b8e5d494813bc80559c.zip |
Simplify k5test.py environments
The initial k5test.py design, copied from the dejagnu suite, is to
create config files and environments for four expected roles: client,
server, master, and slave. This approach exaggerates the complexity
of the common case, where the configurations don't need to vary, and
limits us to having just one slave for kprop/iprop tests.
Instead, create just one configuration by default, and add a
special_env() method which sets up a differently configured
environment for the few test cases which need one. The run_as_*()
methods are collapsed into just run(), which accepts an optional
argument for the environment returned by special_env().
Diffstat (limited to 'src/tests/t_kdb_locking.py')
-rw-r--r-- | src/tests/t_kdb_locking.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tests/t_kdb_locking.py b/src/tests/t_kdb_locking.py index 89da97b422..7c0755ead0 100644 --- a/src/tests/t_kdb_locking.py +++ b/src/tests/t_kdb_locking.py @@ -12,15 +12,11 @@ import os from k5test import * -kdc_conf = { - 'all' : { 'libdefaults' : { 'default_realm' : 'KRBTEST.COM'}} -} - p = 'foo' -realm = K5Realm(kdc_conf=kdc_conf, create_user=False) +realm = K5Realm(create_user=False) realm.addprinc(p, p) -kadm5_lock = os.path.join(realm.testdir, 'master-db.kadm5.lock') +kadm5_lock = os.path.join(realm.testdir, 'db.kadm5.lock') if not os.path.exists(kadm5_lock): fail('kadm5 lock file not created: ' + kadm5_lock) os.unlink(kadm5_lock) |