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

testbench: harden long-running tests against slow CI environment

Browse Source 
while doing so, alos modernize tests
This commit is contained in:
Rainer Gerhards 2019-02-22 15:59:25 +01:00
parent d983ed255f
commit b53c39ea53
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
2 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/imptcp_conndrop-vg.sh
View File

@ -1,31 +1,6 @@
#!/bin/bash #!/bin/bash
# test imptcp with random connection drops export USE_VALGRIND="YES"
# This file is part of the rsyslog project, released under ASL 2.0 export TB_TEST_MAX_RUNTIME=1200 # connection drops are very slow...
# Copyright (C) 2014 Rainer Gerhards -- 2014-11-14
. ${srcdir:=.}/diag.sh init
export NUMMESSAGES=10000 # even if it is slow, we use a large number to be export NUMMESSAGES=10000 # even if it is slow, we use a large number to be
# sure to have sufficient connection drops # sure to have sufficient connection drops - but as low as possible!
generate_conf source ${srcdir:-.}/imptcp_conndrop.sh
add_conf '
$MaxMessageSize 10k
$ModLoad ../plugins/imptcp/.libs/imptcp
$MainMsgQueueTimeoutShutdown 10000
$InputPTCPServerRun '$TCPFLOOD_PORT'
$template outfmt,"%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n"
template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to use relative path names!
$OMFileFlushOnTXEnd off
$OMFileFlushInterval 2
$OMFileIOBufferSize 256k
local0.* ?dynfile;outfmt
'
startup_vg
# 100 byte messages to gain more practical data use
tcpflood -c20 -m$NUMMESSAGES -r -d100 -P129 -D
sleep 10 # due to large messages, we need this time for the tcp receiver to settle...
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown_vg # and wait for it to terminate
check_exit_vg
seq_check 0 $(( NUMMESSAGES - 1 )) -E
exit_test

19
tests/imptcp_conndrop.sh
View File

@ -2,10 +2,10 @@
# Test imptcp with many dropping connections # Test imptcp with many dropping connections
# added 2010-08-10 by Rgerhards # added 2010-08-10 by Rgerhards
# #
# This file is part of the rsyslog project, released under GPLv3 # This file is part of the rsyslog project, released under ASL 2.0
echo ====================================================================================
echo TEST: \[imptcp_conndrop.sh\]: test imptcp with random connection drops
. ${srcdir:=.}/diag.sh init . ${srcdir:=.}/diag.sh init
export NUMMESSAGES=${NUMMESSAGES:-50000} # permit valgrind test to override value
export TB_TEST_MAX_RUNTIME=${TB_TEST_MAX_RUNTIME:-700} # connection drops are very slow...
generate_conf generate_conf
add_conf ' add_conf '
$MaxMessageSize 10k $MaxMessageSize 10k
@ -15,17 +15,16 @@ $MainMsgQueueTimeoutShutdown 10000
$InputPTCPServerRun '$TCPFLOOD_PORT' $InputPTCPServerRun '$TCPFLOOD_PORT'
$template outfmt,"%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n" $template outfmt,"%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n"
template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to use relative path names! template(name="dynfile" type="string" string="'$RSYSLOG_OUT_LOG'")
$OMFileFlushOnTXEnd off
$OMFileFlushInterval 2 $OMFileFlushInterval 2
$OMFileIOBufferSize 256k $OMFileIOBufferSize 256k
local0.* ?dynfile;outfmt local0.* ?dynfile;outfmt
' '
startup startup
# 100 byte messages to gain more practical data use # 100 byte messages to gain more practical data use
tcpflood -c20 -m50000 -r -d100 -P129 -D tcpflood -c20 -m$NUMMESSAGES -r -d100 -P129 -D
sleep 10 # due to large messages, we need this time for the tcp receiver to settle... wait_file_lines
shutdown_when_empty # shut down rsyslogd when done processing messages shutdown_when_empty
wait_shutdown # and wait for it to terminate wait_shutdown
seq_check 0 49999 -E seq_check 0 $((NUMMESSAGES - 1)) -E
exit_test exit_test