From 87d68c5bbd085b081bb73c4bfd83115db8cdc308 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Mon, 3 Mar 2014 20:10:01 +0000 Subject: Fix leaks introduced by error-checking patch. Specifically, I050003a819d2314c8fdfd111df465041c30ee6e3 As usual, the best way to make sure resources get reclaimed is to make sure all return paths go through common cleanup code. This meant a lot of refactoring. Besides general readability benefits, this also got rid of the setjmp/longjmp nonsense flagged in a previous review. Change-Id: Ic232cf342a5168bfc33f6e0a0c8f0530d88f7c5e Signed-off-by: Jeff Darcy --- tests/basic/recon.t | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/basic/recon.t b/tests/basic/recon.t index 405fcb5d2..ab2241c7d 100755 --- a/tests/basic/recon.t +++ b/tests/basic/recon.t @@ -78,11 +78,12 @@ TEST ping_file $M0/probe2 TEST [ $(count_matches probe2) = 1 ] # Restart the brick and give reconciliation a chance to run. +# TBD: figure out why reconciliation takes so $#@! long to run TEST $CLI volume start $V0 force -sleep 10 +sleep 20 # Make sure *both* copies are valid after reconciliation. TEST [ $(count_matches probe2) = 2 ] -#cleanup +cleanup #killall -9 etcd -- cgit