From: Greg Hudson Date: Wed, 5 Nov 2014 19:12:35 +0000 (-0500) Subject: Fix input race condition in t_skew.py X-Git-Tag: krb5-1.12.3-final~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6598664ec1b173d54141d8a227d4affbaab174f;p=thirdparty%2Fkrb5.git 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. (cherry picked from commit 2457bf66c466321dd36cd3c76bc36bb589d31587) ticket: 8135 (new) version_fixed: 1.12.3 status: resolved --- diff --git a/src/tests/t_skew.py b/src/tests/t_skew.py index aa91471428..17649fcd4b 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)')