diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-04-26 04:33:48 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-04-26 04:33:48 +0000 |
| commit | d85fbcebd2d4880972e8565a3d5aba492ef59431 (patch) | |
| tree | 2eea96479aea9dcc09d1545caa8f6a046a26d56f /src/tests/t_crossrealm.py | |
| parent | 60ccf0f7dc305b89179df2454b95a021fbcb09cb (diff) | |
| download | krb5-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/t_crossrealm.py')
| -rw-r--r-- | src/tests/t_crossrealm.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/tests/t_crossrealm.py b/src/tests/t_crossrealm.py index afefb8592c..c0c3ccb158 100644 --- a/src/tests/t_crossrealm.py +++ b/src/tests/t_crossrealm.py @@ -36,7 +36,7 @@ def stop(*realms): # Basic two-realm test with cross TGTs in both directions. -r1, r2 = cross_realms(2, start_kadmind=False) +r1, r2 = cross_realms(2) test_kvno(r1, r2.host_princ, 'basic r1->r2') test_kvno(r2, r1.host_princ, 'basic r2->r1') stop(r1, r2) @@ -47,8 +47,7 @@ stop(r1, r2) # instead. The client will use that to get a TGT for B.X. r1, r2, r3 = cross_realms(3, xtgts=((0,1), (1,2)), args=({'realm': 'A.X'}, {'realm': 'X'}, - {'realm': 'B.X'}), - start_kadmind=False) + {'realm': 'B.X'})) test_kvno(r1, r3.host_princ, 'KDC domain walk') stop(r1, r2, r3) @@ -65,8 +64,7 @@ r1, r2, r3, r4 = cross_realms(4, xtgts=((0,1), (1,2), (2,3)), {'realm': 'C', 'krb5_conf': {'master': capaths}}, {'realm': 'D', - 'krb5_conf': {'master': capaths}}), - start_kadmind=False) + 'krb5_conf': {'master': capaths}})) test_kvno(r1, r4.host_princ, 'client capaths') stop(r1, r2, r3, r4) @@ -79,8 +77,7 @@ r1, r2, r3, r4 = cross_realms(4, xtgts=((0,1), (1,2), (2,3)), args=({'realm': 'A', 'krb5_conf': conf}, {'realm': 'B', 'krb5_conf': conf}, {'realm': 'C', 'krb5_conf': conf}, - {'realm': 'D', 'krb5_conf': conf}), - start_kadmind=False) + {'realm': 'D', 'krb5_conf': conf})) test_kvno(r1, r4.host_princ, 'KDC capaths') stop(r1, r2, r3, r4) @@ -91,8 +88,7 @@ capaths = {'capaths': {'A': {'C': 'B'}}} r1, r2, r3 = cross_realms(3, xtgts=((0,1), (1,2)), args=({'realm': 'A', 'krb5_conf': {'client': capaths}}, - {'realm': 'B'}, {'realm': 'C'}), - start_kadmind=False) + {'realm': 'B'}, {'realm': 'C'})) output = r1.run_as_client([kvno, r3.host_princ], expected_code=1) if 'KDC policy rejects request' not in output: fail('transited 1: Expected error message not in output') @@ -107,8 +103,7 @@ r1, r2, r3, r4 = cross_realms(4, xtgts=((0,1), (1,2), (2,3)), args=({'realm': 'A', 'krb5_conf': conf}, {'realm': 'B', 'krb5_conf': conf}, {'realm': 'C', 'krb5_conf': conf}, - {'realm': 'D'}), - start_kadmind=False) + {'realm': 'D'})) output = r1.run_as_client([kvno, r4.host_princ], expected_code=1) if 'Illegal cross-realm ticket' not in output: fail('transited 2: Expected error message not in output') |