[29316] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix and adjust t_kprop.py
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Feb 29 19:01:23 2016
Date: Mon, 29 Feb 2016 19:01:18 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201603010001.u2101IAg016523@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
https://github.com/krb5/krb5/commit/8955af00901e2f06a937548cd3442b49c694183d
commit 8955af00901e2f06a937548cd3442b49c694183d
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Feb 10 11:50:54 2016 -0500
Fix and adjust t_kprop.py
The listprincs check was at the wrong indentation level and had the
wrong argument grouping; fix it so we actually verify the propagation.
Stop using the -t (runonce) flag to kpropd, so that kpropd continues
to run until k5test.py terminates it. Quit out of the read loop when
we see that the load process is completed, instead of looking for end
of input. This change is needed in order to add hooks in k5test.py
for checking daemons for memory leaks before terminating them.
src/tests/t_kprop.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tests/t_kprop.py b/src/tests/t_kprop.py
index e2026c8..d625627 100755
--- a/src/tests/t_kprop.py
+++ b/src/tests/t_kprop.py
@@ -24,21 +24,21 @@ for realm in multipass_realms(create_user=False):
realm.addprinc('wakawaka')
# Start kpropd.
- kpropd = realm.start_kpropd(slave, ['-d', '-t'])
+ kpropd = realm.start_kpropd(slave, ['-d'])
realm.run([kdb5_util, 'dump', dumpfile])
realm.run([kprop, '-f', dumpfile, '-P', str(realm.kprop_port()), hostname])
output('*** kpropd output follows\n')
while True:
line = kpropd.stdout.readline()
- if line == '':
+ if 'Database load process for full propagation completed' in line:
break
output('kpropd: ' + line)
if 'Rejected connection' in line:
fail('kpropd rejected connection from kprop')
- out = realm.run([kadminl, 'listprincs', slave])
- if 'wakawaka' not in out:
- fail('Slave does not have all principals from master')
+ out = realm.run([kadminl, 'listprincs'], slave)
+ if 'wakawaka' not in out:
+ fail('Slave does not have all principals from master')
success('kprop tests')
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
