summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-03-03 20:10:01 +0000
committerJeff Darcy <jeff@wlan-196-245.bos.redhat.com>2014-03-05 13:18:58 -0500
commit87d68c5bbd085b081bb73c4bfd83115db8cdc308 (patch)
tree2992e14751529b03c32e06c4b277b15767742ef7 /tests/basic
parent2775959b47c15e597a7974bbafa79e0882452952 (diff)
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 <jdarcy@redhat.com>
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic/recon.t5
1 files changed, 3 insertions, 2 deletions
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