From 2f4bef5b2500006ac3632ffd971d285dc69da0b6 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 16 Aug 2012 13:23:49 -0400 Subject: [PATCH] bug 8649: make sure we can exit if a test fails Content-Type: text/plain; charset="utf-8" Signed-off-by: Galen Charlton Signed-off-by: wajasu Signed-off-by: Kyle M Hall --- t/db_dependent/Search.t | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t index 242f259..e949050 100644 --- a/t/db_dependent/Search.t +++ b/t/db_dependent/Search.t @@ -502,12 +502,16 @@ warning_like {( undef, $results_hashref, $facets_loop ) = $results_hashref->{'biblioserver'}->{"RECORDS"}); is($newresults[0]->{'alternateholdings_count'}, 1, 'Alternate holdings filled in correctly'); -kill 9, $child; +END { + if ($child) { + kill 9, $child; -# Clean up the Zebra files since the child process was just shot + # Clean up the Zebra files since the child process was just shot -find(sub { unlink($_) if ( -f $_ && m/\.(mf|pid|LCK)$/ ); }, "$datadir"); -unlink("$datadir/var/run/zebradb/authoritysocket"); -unlink("$datadir/var/run/zebradb/bibliosocket"); + find(sub { unlink($_) if ( -f $_ && m/\.(mf|pid|LCK)$/ ); }, "$datadir"); + unlink("$datadir/var/run/zebradb/authoritysocket"); + unlink("$datadir/var/run/zebradb/bibliosocket"); + } +} 1; -- 1.7.2.5