krb5 commit: Fix input race condition in t_skew.py

Greg Hudson ghudson at mit.edu
Wed Nov 5 14:35:10 EST 2014


https://github.com/krb5/krb5/commit/2457bf66c466321dd36cd3c76bc36bb589d31587
commit 2457bf66c466321dd36cd3c76bc36bb589d31587
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Nov 5 14:12:35 2014 -0500

    Fix input race condition in t_skew.py
    
    In two of the kinit tests run by t_skew.py, we expect kinit to exit
    before reading the password.  If we supply a password input for those
    commands, we can fail with a broken pipe exception if the master
    process tries to write the password after the slave process exits.
    
    Also correctly check the output of the last kinit invocation.
    
    ticket: 8034 (new)
    target_version: 1.13.1
    tags: pullup

 src/tests/t_skew.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/t_skew.py b/src/tests/t_skew.py
index aa91471..17649fc 100644
--- a/src/tests/t_skew.py
+++ b/src/tests/t_skew.py
@@ -40,7 +40,7 @@ realm.kinit(realm.user_princ, password('user'),
 out = realm.kinit(realm.user_princ, password('user'), expected_code=1)
 if 'Clock skew too great in KDC reply' not in out:
     fail('Expected error message not seen in kinit skew case')
-out = realm.kinit(realm.user_princ, password('user'), flags=['-T', fast_cache],
+out = realm.kinit(realm.user_princ, None, flags=['-T', fast_cache],
                   expected_code=1)
 if 'Clock skew too great while' not in out:
     fail('Expected error message not seen in kinit FAST skew case')
@@ -50,8 +50,8 @@ realm.run_kadminl('modprinc +requires_preauth user')
 out = realm.kinit(realm.user_princ, password('user'), expected_code=1)
 if 'Clock skew too great while' not in out:
     fail('Expected error message not seen in kinit skew case (preauth)')
-realm.kinit(realm.user_princ, password('user'), flags=['-T', fast_cache],
-            expected_code=1)
+out = realm.kinit(realm.user_princ, None, flags=['-T', fast_cache],
+                  expected_code=1)
 if 'Clock skew too great while' not in out:
     fail('Expected error message not seen in kinit FAST skew case (preauth)')
 


More information about the cvs-krb5 mailing list