rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 13:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench: fix some races on test termination

Browse Source 
by default, we now use 10s timeout for terminating inputs. On some
slow machines (CI under heavy load) the system default is not sufficient,
what can lead to memory leaks and thus valgrind failures.
This commit is contained in:
Rainer Gerhards 2018-07-24 16:51:19 +02:00
parent 5458f1ce6d
commit b572423733
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/diag.sh
View File

@ -85,7 +85,8 @@ function setvar_RS_HOSTNAME() {
# begin a new testconfig
function generate_conf() {
echo '$ModLoad ../plugins/imdiag/.libs/imdiag
echo 'global(inputs.timeout.shutdown="10000")
$ModLoad ../plugins/imdiag/.libs/imdiag
$IMDiagServerRun 13500
:syslogtag, contains, "rsyslogd" ./rsyslogd.started

2
tests/testsuites/diag-common.conf
View File

@ -10,6 +10,8 @@
$ModLoad ../plugins/imdiag/.libs/imdiag
$IMDiagServerRun 13500
global(inputs.timeout.shutdown="10000")
$template startupfile,"rsyslogd.started" # trick to use relative path names!
:syslogtag, contains, "rsyslogd" ?startupfile

2
tests/testsuites/diag-common2.conf
View File

@ -10,6 +10,8 @@
$ModLoad ../plugins/imdiag/.libs/imdiag
$IMDiagServerRun 13501
global(inputs.timeout.shutdown="10000")
$template startupfile,"rsyslogd2.started" # trick to use relative path names!
:syslogtag, contains, "rsyslogd" ?startupfile