fixed various test issues - 1365085

This commit is contained in:
Frank Cizmich
2014-09-03 14:43:24 -03:00
parent f0a0a8f737
commit 74c70cae92
3 changed files with 48 additions and 1 deletions

View File

@@ -28,7 +28,32 @@ diag(`rm -f $pid_file >/dev/null`);
diag(`touch $pid_file`);
$output = `$cmd -d issue_295 --pid $pid_file 2>&1`;
# to test this issue I must set a timeout in case the command doesn't come back
eval {
# we define an alarm signal handler
local $SIG{'ALRM'} = sub { die "timed out\n" };
# and set the alarm 'clock' to 5 seconds
alarm(5);
# here's the actual command. correct bahaviour is to die with messsage "PID file <pid_file> exists"
# Incorrect behavior is anything else, including not returning control after 5 seconds
$output = `$cmd -d issue_295 --pid $pid_file 2>&1`;
};
if ($@) {
if ($@ eq "timed out\n") {
print "I timed out\n";
}
else {
print "Something else went wrong: $@\n";
}
}
like(
$output,
qr{PID file $pid_file exists},