DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Test suite: Adds timeout for generic_exec, prevents indefinite test suite hangs

Browse Source
This commit is contained in:
Jonathan Bennett 2016-05-19 14:05:48 -05:00
parent 5b2c29e46c
commit bbaf57b66e
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/test-fwknop.pl
View File

@ -6399,12 +6399,35 @@ sub rm_last_args() {
} }
sub generic_exec() { sub generic_exec() {
use POSIX;
my $test_hr = shift; my $test_hr = shift;
my $num_loops = 0;
my $rv = 1; my $rv = 1;
my $pid = fork();
die "[*] Could not fork: $!" unless defined $pid;
my $exec_rv = &run_cmd($test_hr->{'cmdline'}, if ($pid == 0) {
$cmd_out_tmp, $curr_test_file); exit &run_cmd($test_hr->{'cmdline'},
$cmd_out_tmp, $curr_test_file);
}
while (1) {
sleep 5;
$num_loops++;
$rv = waitpid($pid, WNOHANG);
if ($rv != 0) {
$rv = 1;
last;
}
if ($num_loops > 99) { #5 minutes to run
$rv = 0;
kill(9, $pid);
&write_test_file("Command timed out, killing process\n", $curr_test_file);
last;
}
}
my $exec_rv = $?;
if ($test_hr->{'exec_err'} eq $YES) { if ($test_hr->{'exec_err'} eq $YES) {
$rv = 0 if $exec_rv; $rv = 0 if $exec_rv;