[26489] in CVS-changelog-for-Kerberos-V5
svn rev #25820: trunk/src/tests/
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Tue Apr 24 13:04:28 2012
Date: Tue, 24 Apr 2012 13:04:21 -0400
From: ghudson@mit.edu
Message-Id: <201204241704.q3OH4Lw2032168@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25820
Commit By: ghudson
Log Message:
Adjust t_general.py organization
Move some tests out of the multipass_realms loop since they aren't
enctype-dependent. Fix the success message not to mention kvno
wrapping. Don't start kadmind in the multipass_realms loop since we
don't use it.
Changed Files:
U trunk/src/tests/t_general.py
Modified: trunk/src/tests/t_general.py
===================================================================
--- trunk/src/tests/t_general.py 2012-04-24 01:05:41 UTC (rev 25819)
+++ trunk/src/tests/t_general.py 2012-04-24 17:04:21 UTC (rev 25820)
@@ -1,16 +1,7 @@
#!/usr/bin/python
from k5test import *
-for realm in multipass_realms(create_host=False):
- # Create a policy and see if it survives a dump/load.
- realm.run_kadminl('addpol fred')
- dumpfile = os.path.join(realm.testdir, 'dump')
- realm.run_as_master([kdb5_util, 'dump', dumpfile])
- realm.run_as_master([kdb5_util, 'load', dumpfile])
- output = realm.run_kadminl('getpols')
- if 'fred\n' not in output:
- fail('Policy not preserved across dump/load.')
-
+for realm in multipass_realms(create_host=False, start_kadmind=False):
# Check that kinit fails appropriately with the wrong password.
output = realm.run_as_client([kinit, realm.user_princ], input='wrong\n',
expected_code=1)
@@ -29,14 +20,23 @@
realm.klist('user/fast@%s' % realm.realm)
# Test kinit against kdb keytab
- realm.run_as_master([kinit, "-k", "-t",
- "KDB:", realm.user_princ])
+ realm.run_as_master([kinit, "-k", "-t", "KDB:", realm.user_princ])
+realm = K5Realm(create_host=False, start_kadmind=False)
- # Test kdestroy and klist of a non-existent ccache.
- realm.run_as_client([kdestroy])
- output = realm.run_as_client([klist], expected_code=1)
- if 'No credentials cache found' not in output:
- fail('Expected error message not seen in klist output')
+# Create a policy and see if it survives a dump/load.
+realm.run_kadminl('addpol fred')
+dumpfile = os.path.join(realm.testdir, 'dump')
+realm.run_as_master([kdb5_util, 'dump', dumpfile])
+realm.run_as_master([kdb5_util, 'load', dumpfile])
+output = realm.run_kadminl('getpols')
+if 'fred\n' not in output:
+ fail('Policy not preserved across dump/load.')
-success('Dump/load, FAST kinit, kdestroy, kvno wrapping')
+# Test kdestroy and klist of a non-existent ccache.
+realm.run_as_client([kdestroy])
+output = realm.run_as_client([klist], expected_code=1)
+if 'No credentials cache found' not in output:
+ fail('Expected error message not seen in klist output')
+
+success('Dump/load, FAST kinit, kdestroy')
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
