aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2014-08-06 15:03:03 -0400
committerTom Yu <tlyu@mit.edu>2014-08-06 15:37:18 -0400
commit9831cb6930e40af1240ee67eef31c83ecadcce5c (patch)
treef9e4d099190dda294e793ca0516428b4d9ca38ec
parent99f4809a8dc280956ba6c1e3f0cd6f9b23c2f55b (diff)
downloadkrb5-9831cb6930e40af1240ee67eef31c83ecadcce5c.zip
krb5-9831cb6930e40af1240ee67eef31c83ecadcce5c.tar.gz
krb5-9831cb6930e40af1240ee67eef31c83ecadcce5c.tar.bz2
Fix KDC race in t_unlockiter.py
The second KDC startup in t_unlockiter.py could race with the garbage-collected shutdown of the first, causing the second one to fail to bind the listening port. Avoid the situation by setting start_kdc=False, because there doesn't need to be a KDC running for these tests anyway. Also use create_user=False and create_host=False, because those principals aren't necessary either. ticket: 7977
-rw-r--r--src/tests/t_unlockiter.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tests/t_unlockiter.py b/src/tests/t_unlockiter.py
index d4ca4c5..2a438e9 100644
--- a/src/tests/t_unlockiter.py
+++ b/src/tests/t_unlockiter.py
@@ -3,14 +3,15 @@ from k5test import *
# Default KDB iteration is locked. Expect write lock failure unless
# unlocked iteration is explicitly requested.
-realm = K5Realm()
+realm = K5Realm(create_user=False, create_host=False, start_kdc=False)
realm.run(['./unlockiter'], expected_code=1)
realm.run(['./unlockiter', '-u'])
realm.run(['./unlockiter', '-l'], expected_code=1)
# Set default to unlocked iteration. Only explicitly requested locked
# iteration should block the write lock.
-realm = K5Realm(krb5_conf={'dbmodules': {'db': {'unlockiter': 'true'}}})
+realm = K5Realm(create_user=False, create_host=False, start_kdc=False,
+ krb5_conf={'dbmodules': {'db': {'unlockiter': 'true'}}})
realm.run(['./unlockiter'])
realm.run(['./unlockiter', '-u'])
realm.run(['./unlockiter', '-l'], expected_code=1)