From be048f9674ea9fbe57ecdd7357daacf619bbd293 Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Fri, 1 Mar 2013 06:21:28 -0300 Subject: [PATCH] pt-fifo-split: Fix for the blocking tests --- t/pt-fifo-split/pt-fifo-split.t | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/pt-fifo-split/pt-fifo-split.t b/t/pt-fifo-split/pt-fifo-split.t index 647c1279..40f268a0 100644 --- a/t/pt-fifo-split/pt-fifo-split.t +++ b/t/pt-fifo-split/pt-fifo-split.t @@ -41,8 +41,14 @@ my @fifo; while (kill 0, $pid) { if ( -e $fifo ) { eval { + local $SIG{ALRM} = sub { die "read timeout" }; + alarm 3; my $contents = slurp_file($fifo); push @fifo, $contents; + alarm 0; + }; + if (my $e = $@) { + die $e unless $e =~ /\Aread timeout\z/; } } } @@ -72,8 +78,14 @@ PerconaTest::wait_until(sub { -p $fifo }); while (kill 0, $pid) { if ( -e $fifo ) { eval { + local $SIG{ALRM} = sub { die "read timeout" }; + alarm 3; my $contents = slurp_file($fifo); push @fifo, $contents; + alarm 0; + }; + if (my $e = $@) { + die $e unless $e =~ /\Aread timeout\z/; } } }