From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 16 Jun 2013 20:42:00 +0000 (-0400)
Subject: Fix timing edge cases in t_renew.py
X-Git-Tag: krb5-1.12-alpha1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e6000e2c48460ed2e4bd084d96a6dc21def1231;p=thirdparty%2Fkrb5.git

Fix timing edge cases in t_renew.py

When we are testing maximum renewable lifetimes, the KDC might process
the request at a later time than the request time (typically by no
more than one second).  So we need to ask for a ticket lifetime longer
than the maximum renewable lifetime, not equal to it, or we risk
getting a just-barely-renewable ticket instead of a non-renewable one.
Also fix a couple of typos in comments.
---

diff --git a/src/tests/t_renew.py b/src/tests/t_renew.py
index a5fd0126ef..acfdae6d28 100644
--- a/src/tests/t_renew.py
+++ b/src/tests/t_renew.py
@@ -33,12 +33,12 @@ out = realm.kinit(realm.user_princ, flags=['-R'], expected_code=1)
 if "KDC can't fulfill requested option" not in out:
     fail('expected error not seen renewing non-renewable ticket')
 
-# Test that -allow_reneable on the client principal works.
+# Test that -allow_renewable on the client principal works.
 realm.run_kadminl('modprinc -allow_renewable user')
 test('disallowed client', '1h', '2h', False)
 realm.run_kadminl('modprinc +allow_renewable user')
 
-# Test that -allow_reneable on the server principal works.
+# Test that -allow_renewable on the server principal works.
 realm.run_kadminl('modprinc -allow_renewable %s' % realm.krbtgt_princ)
 test('disallowed server', '1h', '2h', False)
 realm.run_kadminl('modprinc +allow_renewable %s' % realm.krbtgt_princ)
@@ -58,17 +58,17 @@ realm.run_kadminl('modprinc -maxlife "20 hours" user')
 # Test maximum renewable life on the client principal.
 realm.run_kadminl('modprinc -maxrenewlife "5 hours" user')
 test('maxrenewlife client yes', '4h', '5h', True)
-test('maxrenewlife client no', '5h', '10h', False)
+test('maxrenewlife client no', '6h', '10h', False)
 
 # Test maximum renewable life on the server principal.
-realm.run_kadminl('modprinc -maxrenewlife "4 hours" %s' % realm.krbtgt_princ)
-test('maxrenewlife server yes', '3h', '4h', True)
+realm.run_kadminl('modprinc -maxrenewlife "3 hours" %s' % realm.krbtgt_princ)
+test('maxrenewlife server yes', '2h', '3h', True)
 test('maxrenewlife server no', '4h', '8h', False)
 
 # Test realm maximum life.
 realm.run_kadminl('modprinc -maxrenewlife "40 hours" user')
 realm.run_kadminl('modprinc -maxrenewlife "40 hours" %s' % realm.krbtgt_princ)
 test('maxrenewlife realm yes', '10h', '20h', True)
-test('maxrenewlife realm no', '20h', '40h', False)
+test('maxrenewlife realm no', '21h', '40h', False)
 
 success('Renewing credentials')