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

Merge pull request #2942 from rgerhards/tb6

Browse Source 
testbench: some minor improvements
This commit is contained in:
Rainer Gerhards 2018-08-19 12:18:58 +02:00 committed by GitHub
commit c87c5bcd98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
168 changed files with 281 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/action-tx-errfile.sh
View File

@ -20,7 +20,7 @@ if((not($msg contains "error")) and ($msg contains "msgnum:")) then {
}
'
startup
. $srcdir/diag.sh injectmsg 0 50
injectmsg 0 50
shutdown_when_empty
wait_shutdown
cmp testsuites/action-tx-errfile.result ${RSYSLOG2_OUT_LOG}

2
tests/action-tx-single-processing.sh
View File

@ -23,7 +23,7 @@ if($msg contains "msgnum:") then {
action(type="omfile" file=`echo $RSYSLOG2_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

6
tests/array_lookup_table-vg.sh
View File

@ -25,7 +25,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate_array.lkp_tbl xlate_array.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -33,7 +33,7 @@ startup_vg
cp -f $srcdir/testsuites/xlate_array_more.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
@ -41,7 +41,7 @@ cp -f $srcdir/testsuites/xlate_array_more.lkp_tbl xlate_array.lkp_tbl
cp -f $srcdir/testsuites/xlate_array_more_with_duplicates_and_nomatch.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 12
injectmsg 0 12
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

6
tests/array_lookup_table.sh
View File

@ -25,7 +25,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate_array.lkp_tbl xlate_array.lkp_tbl
startup
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -33,7 +33,7 @@ startup
cp -f $srcdir/testsuites/xlate_array_more.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
@ -41,7 +41,7 @@ cp -f $srcdir/testsuites/xlate_array_more.lkp_tbl xlate_array.lkp_tbl
cp -f $srcdir/testsuites/xlate_array_more_with_duplicates_and_nomatch.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 12
injectmsg 0 12
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

6
tests/array_lookup_table_misuse-vg.sh
View File

@ -25,7 +25,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate_array_misuse.lkp_tbl xlate_array.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -33,7 +33,7 @@ startup_vg
cp -f $srcdir/testsuites/xlate_array_more_misuse.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -41,7 +41,7 @@ cp -f $srcdir/testsuites/xlate_array_more_misuse.lkp_tbl xlate_array.lkp_tbl
cp -f $srcdir/testsuites/xlate_array_more.lkp_tbl xlate_array.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/arrayqueue.sh
View File

@ -19,7 +19,7 @@ template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to
startup
# 40000 messages should be enough
. $srcdir/diag.sh injectmsg 0 40000
injectmsg 0 40000
shutdown_when_empty
wait_shutdown
seq_check 0 39999

2
tests/cee_diskqueue.sh
View File

@ -25,7 +25,7 @@ add_conf 'then
queue.type="disk" queue.filename="rsyslog-act1")
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/cee_simple.sh
View File

@ -14,7 +14,7 @@ add_conf 'then
action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

8
tests/da-mainmsg-q.sh
View File

@ -35,16 +35,16 @@ startup
# part1: send first 50 messages (in memory, only)
#tcpflood 127.0.0.1 '$TCPFLOOD_PORT' 1 50
. $srcdir/diag.sh injectmsg 0 50
injectmsg 0 50
. $srcdir/diag.sh wait-queueempty # let queue drain for this test case
# part 2: send bunch of messages. This should trigger DA mode
#. $srcdir/diag.sh injectmsg 50 20000
. $srcdir/diag.sh injectmsg 50 2000
#injectmsg 50 20000
injectmsg 50 2000
ls -l test-spool # for manual review
# send another handful
. $srcdir/diag.sh injectmsg 2050 50
injectmsg 2050 50
#sleep 1 # we need this so that rsyslogd can receive all outstanding messages
# clean up and check test result

4
tests/daqueue-dirty-shutdown.sh
View File

@ -42,7 +42,7 @@ template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to
:msg, contains, "msgnum:" :omtesting:sleep 10 0
'
startup
$srcdir/diag.sh injectmsg 0 210000
injectmsg 0 210000
echo spool files immediately before shutdown:
ls test-spool
. $srcdir/diag.sh shutdown-immediate # shut down without the ability to fully persist state
@ -95,7 +95,7 @@ template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to
startup
#. $srcdir/diag.sh wait-queueempty
#echo existing queue empty, injecting new data
#$srcdir/diag.sh injectmsg 1000000 1000
#injectmsg 1000000 1000
shutdown_when_empty
wait_shutdown

2
tests/daqueue-invld-qi.sh
View File

@ -37,7 +37,7 @@ echo "*.* :omtesting:sleep 0 1000" > work-delay.conf
# inject 10000 msgs, so that DO hit the high watermark
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
. $srcdir/diag.sh shutdown-immediate
wait_shutdown
. $srcdir/diag.sh check-mainq-spool

2
tests/daqueue-persist-drvr.sh
View File

@ -38,7 +38,7 @@ echo "*.* :omtesting:sleep 0 1000" > work-delay.conf
# inject 10000 msgs, so that DO hit the high watermark
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
. $srcdir/diag.sh shutdown-immediate
wait_shutdown
. $srcdir/diag.sh check-mainq-spool

7
tests/diag.sh
View File

@ -221,6 +221,13 @@ function startup_vgthread() {
}
# inject messages via our inject interface (imdiag)
function injectmsg() {
echo injecting $2 messages
echo injectmsg $1 $2 $3 $4 | $TESTTOOL_DIR/diagtalker -p$IMDIAG_PORT || error_exit $?
}
# shut rsyslogd down when main queue is empty. $1 is the instance.
function shutdown_when_empty() {
if [ "$1" == "2" ]

2
tests/dircreate_dflt.sh
View File

@ -16,7 +16,7 @@ $template dynfile,"test-logdir/'$RSYSLOG_OUT_LOG'"
*.* ?dynfile
'
startup
. $srcdir/diag.sh injectmsg 0 1 # a single message is sufficient
injectmsg 0 1 # a single message is sufficient
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
if [ ! -e test-logdir/$RSYSLOG_OUT_LOG ]

2
tests/dircreate_off.sh
View File

@ -17,7 +17,7 @@ $template dynfile,"test-logdir/'$RSYSLOG_OUT_LOG'"
*.* ?dynfile
'
startup
. $srcdir/diag.sh injectmsg 0 1 # a single message is sufficient
injectmsg 0 1 # a single message is sufficient
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
if [ -e test-logdir/$RSYSLOG_OUT_LOG ]

2
tests/diskqueue-fsync.sh
View File

@ -33,7 +33,7 @@ template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to
'
startup
# 1000 messages should be enough - the disk fsync test is very slow!
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 0 999

2
tests/diskqueue-full.sh
View File

@ -25,7 +25,7 @@ template(name="outfmt" type="string"
file=`echo $RSYSLOG_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 20000
injectmsg 0 20000
ls -l test-spool
shutdown_when_empty
wait_shutdown

2
tests/es-basic-abort.sh
View File

@ -26,7 +26,7 @@ if $msg contains "msgnum:" then
searchIndex="rsyslog_testbench")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
./msleep 500
echo stop elasticsearch...
. $srcdir/diag.sh stop-elasticsearch

2
tests/es-basic-bulk-vg.sh
View File

@ -22,7 +22,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
bulkmode="on")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh es-getdata 10000 $ES_PORT

2
tests/es-basic-bulk.sh
View File

@ -22,7 +22,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
bulkmode="on")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 $ES_PORT

2
tests/es-basic-errfile-empty.sh
View File

@ -22,7 +22,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
errorFile="./rsyslog.errorfile")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 $ES_PORT

2
tests/es-basic-errfile-popul.sh
View File

@ -38,7 +38,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
errorFile="./rsyslog.errorfile")
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty
wait_shutdown
if [ ! -f rsyslog.errorfile ]

2
tests/es-basic-es6.0.sh
View File

@ -23,7 +23,7 @@ if $msg contains "msgnum:" then
searchIndex="rsyslog_testbench")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 19200

2
tests/es-basic-ha-vg.sh
View File

@ -22,7 +22,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
bulkmode="on")
'
startup_vg
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown_vg

2
tests/es-basic-ha.sh
View File

@ -27,7 +27,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
searchIndex="rsyslog_testbench")
'
startup
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh wait-for-stats-flush 'rsyslog.out.stats.log'
shutdown_when_empty

2
tests/es-basic-server.sh
View File

@ -21,7 +21,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
searchIndex="rsyslog_testbench")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 $ES_PORT

2
tests/es-basic-vg.sh
View File

@ -24,7 +24,7 @@ if $msg contains "msgnum:" then
searchIndex="rsyslog_testbench")
'
startup_vg
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/es-basic-vgthread.sh
View File

@ -24,7 +24,7 @@ if $msg contains "msgnum:" then
searchIndex="rsyslog_testbench")
'
startup_vgthread
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/es-basic.sh
View File

@ -24,7 +24,7 @@ if $msg contains "msgnum:" then
searchIndex="rsyslog_testbench")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 19200

2
tests/es-bulk-errfile-empty.sh
View File

@ -23,7 +23,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
errorFile="./rsyslog.errorfile")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 $ES_PORT

2
tests/es-bulk-errfile-popul.sh
View File

@ -37,7 +37,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
errorFile="./rsyslog.errorfile")
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty
wait_shutdown
if [ ! -f rsyslog.errorfile ]

2
tests/es-bulk-retry.sh
View File

@ -107,7 +107,7 @@ fi
numrecords=100
success=50
badarg=50
. $srcdir/diag.sh injectmsg 0 $numrecords
injectmsg 0 $numrecords
shutdown_when_empty
if [ "x${USE_VALGRIND:-false}" == "xtrue" ] ; then
wait_shutdown_vg

2
tests/es-maxbytes-bulk.sh
View File

@ -22,7 +22,7 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
maxbytes="1k")
'
startup
. $srcdir/diag.sh injectmsg 0 10000
injectmsg 0 10000
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 10000 19200

6
tests/es-writeoperation.sh
View File

@ -27,7 +27,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG`)
# . $srcdir/diag.sh es-init
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty
wait_shutdown
if grep -q "omelasticsearch: writeoperation '1' requires bulkid" $RSYSLOG_OUT_LOG ; then
@ -59,7 +59,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG`)
# . $srcdir/diag.sh es-init
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty
wait_shutdown
if grep -q "omelasticsearch: invalid value 'unknown' for writeoperation" $RSYSLOG_OUT_LOG ; then
@ -99,7 +99,7 @@ export ES_PORT=19200
#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
#export RSYSLOG_DEBUGLOG="debug.log"
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty
wait_shutdown
. $srcdir/diag.sh es-getdata 1 $ES_PORT

2
tests/execonlywhenprevsuspended-nonsusp-queue.sh
View File

@ -27,7 +27,7 @@ template(name="outfmt" type="string" string="%msg:F,58:2%\n")
}
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty
wait_shutdown
ls *.out.log

2
tests/execonlywhenprevsuspended-nonsusp.sh
View File

@ -24,7 +24,7 @@ template(name="outfmt" type="string" string="%msg:F,58:2%\n")
}
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty
wait_shutdown
seq_check 0 999

2
tests/execonlywhenprevsuspended-queue.sh
View File

@ -29,7 +29,7 @@ template(name="outfmt" type="string" string="%msg:F,58:2%\n")
}
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty
wait_shutdown
seq_check 1 999

2
tests/execonlywhenprevsuspended.sh
View File

@ -21,7 +21,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 1 999

2
tests/execonlywhenprevsuspended2.sh
View File

@ -26,7 +26,7 @@ $ActionExecOnlyWhenPreviousIsSuspended off
:msg, contains, "msgnum:" ./'"${RSYSLOG2_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
echo check file 1

2
tests/execonlywhenprevsuspended3.sh
View File

@ -25,7 +25,7 @@ $ActionExecOnlyWhenPreviousIsSuspended off
& ./'"${RSYSLOG2_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
echo check file 1

2
tests/execonlywhenprevsuspended4.sh
View File

@ -20,7 +20,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG2_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 1 999

4
tests/execonlywhenprevsuspended_multiwrkr.sh
View File

@ -20,9 +20,9 @@ startup
# we cannot really control which are the first two messages imdiag sees,
# and so we do not know for sure which numbers are skipped. So we inject
# those 10 to get past that point.
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
./msleep 500
. $srcdir/diag.sh injectmsg 10 990
injectmsg 10 990
shutdown_when_empty
wait_shutdown
seq_check 1 999

2
tests/failover-async.sh
View File

@ -20,7 +20,7 @@ $ActionQueueType LinkedList
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-basic-vg.sh
View File

@ -19,7 +19,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup_vg
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-basic.sh
View File

@ -12,7 +12,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

4
tests/failover-double.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# This file is part of the rsyslog project, released under ASL 2.0
. $srcdir/diag.sh init
export DEAD_PORT="$(get_free_port)"
export DEAD_PORT=4 # a port unassigned by IANA and very unlikely to be used
generate_conf
add_conf '
$template outfmt,"%msg:F,58:2%\n"
@ -13,7 +13,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
$ActionExecOnlyWhenPreviousIsSuspended off
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown
seq_check 0 4999

2
tests/failover-no-basic-vg.sh
View File

@ -20,7 +20,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"'
'
startup_vg
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-no-basic.sh
View File

@ -13,7 +13,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"'
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-no-rptd-vg.sh
View File

@ -20,7 +20,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"'
'
startup_vg
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-no-rptd.sh
View File

@ -13,7 +13,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"'
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-rptd-vg.sh
View File

@ -21,7 +21,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup_vg
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/failover-rptd.sh
View File

@ -14,7 +14,7 @@ $ActionExecOnlyWhenPreviousIsSuspended on
& ./'"${RSYSLOG_OUT_LOG}"';outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/glbl-umask.sh
View File

@ -17,7 +17,7 @@ template(name="outfmt" type="string" string="%msg:F,58:2%\n")
}
'
startup
$srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty
wait_shutdown

2
tests/glbl_setenv.sh
View File

@ -12,7 +12,7 @@ template(name="outfmt" type="string" string="%$!prx%\n")
file=`echo $RSYSLOG_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown # we need to wait until rsyslogd is finished!

2
tests/glbl_setenv_2_vars.sh
View File

@ -14,7 +14,7 @@ template(name="outfmt" type="string" string="%$!prx%, %$!second%\n")
file=`echo $RSYSLOG_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown # we need to wait until rsyslogd is finished!

2
tests/glbl_setenv_err.sh
View File

@ -9,7 +9,7 @@ global(environment="http_proxy ERROR")
action(type="omfile" file=`echo $RSYSLOG_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown # we need to wait until rsyslogd is finished!

2
tests/glbl_setenv_err_too_long.sh
View File

@ -9,7 +9,7 @@ global(environment="NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
action(type="omfile" file=`echo $RSYSLOG_OUT_LOG`)
'
startup
. $srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown # we need to wait until rsyslogd is finished!

2
tests/global_vars.sh
View File

@ -26,7 +26,7 @@ if $msg contains "msgnum:" then {
startup
# 40000 messages should be enough
. $srcdir/diag.sh injectmsg 0 40000
injectmsg 0 40000
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown

2
tests/incltest.sh
View File

@ -5,7 +5,7 @@ add_conf "\$IncludeConfig ${srcdir}/testsuites/incltest.d/include.conf
"
startup
# 100 messages are enough - the question is if the include is read ;)
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
shutdown_when_empty
wait_shutdown
seq_check 0 99

2
tests/incltest_dir.sh
View File

@ -17,7 +17,7 @@ add_conf "\$IncludeConfig ${srcdir}/testsuites/incltest.d/
"
startup
# 100 messages are enough - the question is if the include is read ;)
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 0 99

2
tests/incltest_dir_empty_wildcard.sh
View File

@ -10,7 +10,7 @@ add_conf '$template outfmt,"%msg:F,58:2%\n"
:msg, contains, "msgnum:" action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")'
startup
# 100 messages are enough - the question is if the include is read ;)
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 0 99

2
tests/incltest_dir_wildcard.sh
View File

@ -5,7 +5,7 @@ add_conf "include(file=\"${srcdir}/testsuites/incltest.d/*.conf\")
"
startup
# 100 messages are enough - the question is if the include is read ;)
. $srcdir/diag.sh injectmsg 0 100
injectmsg 0 100
shutdown_when_empty # shut down rsyslogd when done processing messages
wait_shutdown
seq_check 0 99

2
tests/include-obj-in-if-vg.sh
View File

@ -14,7 +14,7 @@ add_conf '
}
'
startup_vg
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/include-obj-outside-control-flow-vg.sh
View File

@ -15,7 +15,7 @@ add_conf "
include(file=\"${srcdir}/testsuites/include-std-omfile-actio*.conf\")
"
startup_vg
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/include-obj-text-from-file.sh
View File

@ -11,7 +11,7 @@ add_conf "
}
"
startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
shutdown_when_empty
wait_shutdown
seq_check 0 9

2
tests/include-obj-text-vg.sh
View File

@ -13,7 +13,7 @@ if $msg contains "msgnum:" then {
}
'
startup_vg
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/libdbi-asyn.sh
View File

@ -19,7 +19,7 @@ $ActionLibdbiDBName Syslog
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 50000
injectmsg 0 50000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/libdbi-basic-vg.sh
View File

@ -17,7 +17,7 @@ $ActionLibdbiDBName Syslog
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup_vg_noleak
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/libdbi-basic.sh
View File

@ -15,7 +15,7 @@ $ActionLibdbiDBName Syslog
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/linkedlistqueue.sh
View File

@ -19,7 +19,7 @@ template(name="dynfile" type="string" string=`echo $RSYSLOG_OUT_LOG`) # trick to
:msg, contains, "msgnum:" ?dynfile;outfmt
'
startup
. $srcdir/diag.sh injectmsg 0 40000
injectmsg 0 40000
shutdown_when_empty
wait_shutdown
seq_check 0 39999

6
tests/lookup_table-vg.sh
View File

@ -23,7 +23,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -31,7 +31,7 @@ startup_vg
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
@ -39,7 +39,7 @@ cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

6
tests/lookup_table.sh
View File

@ -23,7 +23,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -31,7 +31,7 @@ startup
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
@ -39,7 +39,7 @@ cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

32
tests/lookup_table_bad_configs-vg.sh
View File

@ -27,21 +27,21 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
echo "empty file..."
cp -f $srcdir/testsuites/xlate_empty_file.lkp_tbl xlate.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
echo "table with invalid-json..."
cp -f $srcdir/testsuites/xlate_invalid_json.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
echo "string-table with no index-key..."
cp -f $srcdir/testsuites/xlate_string_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -51,7 +51,7 @@ echo "array-table with no index-key..."
cp -f $srcdir/testsuites/xlate_array_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -61,7 +61,7 @@ echo "sparse-array-table with no index-key..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -71,7 +71,7 @@ echo "string-table with no value..."
cp -f $srcdir/testsuites/xlate_string_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -79,7 +79,7 @@ echo "array-table with no value..."
cp -f $srcdir/testsuites/xlate_array_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -87,7 +87,7 @@ echo "sparse-array-table with no value..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -95,7 +95,7 @@ echo "incorrect-version in lookup-table..."
cp -f $srcdir/testsuites/xlate_incorrect_version.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -105,7 +105,7 @@ echo "incorrect-type in lookup-table..."
cp -f $srcdir/testsuites/xlate_incorrect_type.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -115,7 +115,7 @@ echo "string-table with no table..."
cp -f $srcdir/testsuites/xlate_string_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -123,7 +123,7 @@ echo "array-table with no table..."
cp -f $srcdir/testsuites/xlate_array_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -131,7 +131,7 @@ echo "sparse-array-table with no table..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -139,7 +139,7 @@ echo "string-table with empty table..."
cp -f $srcdir/testsuites/xlate_string_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_str"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_str"
@ -148,7 +148,7 @@ echo "array-table with empty table..."
cp -f $srcdir/testsuites/xlate_array_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_arr"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_arr"
@ -157,7 +157,7 @@ echo "sparse-array-table with empty table..."
cp -f $srcdir/testsuites/xlate_sparseArray_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_sparse_arr"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_sparse_arr"

32
tests/lookup_table_bad_configs.sh
View File

@ -27,21 +27,21 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
echo "empty file..."
cp -f $srcdir/testsuites/xlate_empty_file.lkp_tbl xlate.lkp_tbl
startup
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
echo "table with invalid-json..."
cp -f $srcdir/testsuites/xlate_invalid_json.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
echo "string-table with no index-key..."
cp -f $srcdir/testsuites/xlate_string_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -51,7 +51,7 @@ echo "array-table with no index-key..."
cp -f $srcdir/testsuites/xlate_array_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -61,7 +61,7 @@ echo "sparse-array-table with no index-key..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_index.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -71,7 +71,7 @@ echo "string-table with no value..."
cp -f $srcdir/testsuites/xlate_string_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -79,7 +79,7 @@ echo "array-table with no value..."
cp -f $srcdir/testsuites/xlate_array_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -87,7 +87,7 @@ echo "sparse-array-table with no value..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_value.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -95,7 +95,7 @@ echo "incorrect-version in lookup-table..."
cp -f $srcdir/testsuites/xlate_incorrect_version.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -105,7 +105,7 @@ echo "incorrect-type in lookup-table..."
cp -f $srcdir/testsuites/xlate_incorrect_type.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "foo"
. $srcdir/diag.sh assert-content-missing "bar"
@ -115,7 +115,7 @@ echo "string-table with no table..."
cp -f $srcdir/testsuites/xlate_string_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -123,7 +123,7 @@ echo "array-table with no table..."
cp -f $srcdir/testsuites/xlate_array_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -131,7 +131,7 @@ echo "sparse-array-table with no table..."
cp -f $srcdir/testsuites/xlate_sparseArray_no_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 5
injectmsg 0 5
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh assert-content-missing "baz"
@ -139,7 +139,7 @@ echo "string-table with empty table..."
cp -f $srcdir/testsuites/xlate_string_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_str"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_str"
@ -148,7 +148,7 @@ echo "array-table with empty table..."
cp -f $srcdir/testsuites/xlate_array_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_arr"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_arr"
@ -157,7 +157,7 @@ echo "sparse-array-table with empty table..."
cp -f $srcdir/testsuites/xlate_sparseArray_empty_table.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: baz_sparse_arr"
. $srcdir/diag.sh content-check "msgnum:00000001: baz_sparse_arr"

4
tests/lookup_table_no_hup_reload-vg.sh
View File

@ -23,7 +23,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -31,7 +31,7 @@ startup_vg
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

4
tests/lookup_table_no_hup_reload.sh
View File

@ -23,7 +23,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
'
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
@ -31,7 +31,7 @@ startup
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

8
tests/lookup_table_rscript_reload-vg.sh
View File

@ -29,24 +29,24 @@ cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup_vg
# the last message ..002 should cause successful lookup-table reload
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
. $srcdir/diag.sh assert-content-missing "baz"
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
. $srcdir/diag.sh content-check "msgnum:00000002: baz"
rm -f xlate.lkp_tbl # this should lead to unsuccessful reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

8
tests/lookup_table_rscript_reload.sh
View File

@ -29,24 +29,24 @@ cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup
# the last message ..002 should cause successful lookup-table reload
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
. $srcdir/diag.sh assert-content-missing "baz"
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
. $srcdir/diag.sh content-check "msgnum:00000002: baz"
rm -f xlate.lkp_tbl # this should lead to unsuccessful reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

8
tests/lookup_table_rscript_reload_without_stub-vg.sh
View File

@ -29,24 +29,24 @@ cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup_vg
# the last message ..002 should cause successful lookup-table reload
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
. $srcdir/diag.sh assert-content-missing "baz"
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
. $srcdir/diag.sh content-check "msgnum:00000002: baz"
rm -f xlate.lkp_tbl # this should lead to unsuccessful reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

8
tests/lookup_table_rscript_reload_without_stub.sh
View File

@ -29,24 +29,24 @@ cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
startup
# the last message ..002 should cause successful lookup-table reload
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
. $srcdir/diag.sh assert-content-missing "baz"
cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
. $srcdir/diag.sh content-check "msgnum:00000002: baz"
rm -f xlate.lkp_tbl # this should lead to unsuccessful reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh injectmsg 0 2
injectmsg 0 2
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

6
tests/multiple_lookup_tables-vg.sh
View File

@ -26,7 +26,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate_1.lkp_tbl
startup_vg
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: 0_foo_old 1_foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: 0_bar_old 1_bar_old"
@ -34,7 +34,7 @@ startup_vg
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: 0_foo_new 1_foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: 0_bar_new 1_bar_old"
@ -43,7 +43,7 @@ cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate_1.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

6
tests/multiple_lookup_tables.sh
View File

@ -26,7 +26,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate.lkp_tbl xlate_1.lkp_tbl
startup
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: 0_foo_old 1_foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: 0_bar_old 1_bar_old"
@ -34,7 +34,7 @@ startup
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
. $srcdir/diag.sh wait-queueempty
. $srcdir/diag.sh content-check "msgnum:00000000: 0_foo_new 1_foo_old"
. $srcdir/diag.sh content-check "msgnum:00000001: 0_bar_new 1_bar_old"
@ -43,7 +43,7 @@ cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate.lkp_tbl
cp -f $srcdir/testsuites/xlate_more.lkp_tbl xlate_1.lkp_tbl
. $srcdir/diag.sh issue-HUP
. $srcdir/diag.sh await-lookup-table-reload
. $srcdir/diag.sh injectmsg 0 3
injectmsg 0 3
echo doing shutdown
shutdown_when_empty
echo wait on shutdown

2
tests/mysql-actq-mt-withpause-extended.sh
View File

@ -27,7 +27,7 @@ let "strtnum = 0"
for i in {1..50}
do
echo "running iteration $i, startnum: $strtnum"
. $srcdir/diag.sh injectmsg $strtnum 5000
injectmsg $strtnum 5000
. $srcdir/diag.sh wait-queueempty
echo waiting for worker threads to timeout
./msleep 1000

6
tests/mysql-actq-mt-withpause-vg.sh
View File

@ -20,15 +20,15 @@ module(load="../plugins/ommysql/.libs/ommysql")
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup_vg
. $srcdir/diag.sh injectmsg 0 50000
injectmsg 0 50000
. $srcdir/diag.sh wait-queueempty
echo waiting for worker threads to timeout
./msleep 3000
. $srcdir/diag.sh injectmsg 50000 50000
injectmsg 50000 50000
. $srcdir/diag.sh wait-queueempty
echo waiting for worker threads to timeout
./msleep 2000
. $srcdir/diag.sh injectmsg 100000 50000
injectmsg 100000 50000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

6
tests/mysql-actq-mt-withpause.sh
View File

@ -20,15 +20,15 @@ module(load="../plugins/ommysql/.libs/ommysql")
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 50000
injectmsg 0 50000
. $srcdir/diag.sh wait-queueempty
echo waiting for worker threads to timeout
./msleep 3000
. $srcdir/diag.sh injectmsg 50000 50000
injectmsg 50000 50000
. $srcdir/diag.sh wait-queueempty
echo waiting for worker threads to timeout
./msleep 2000
. $srcdir/diag.sh injectmsg 100000 50000
injectmsg 100000 50000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/mysql-actq-mt.sh
View File

@ -20,7 +20,7 @@ module(load="../plugins/ommysql/.libs/ommysql")
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 150000
injectmsg 0 150000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/mysql-asyn-vg.sh
View File

@ -12,7 +12,7 @@ $ActionQueueTimeoutEnqueue 10000 # 10 second to make sure we do not loose due to
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup_vg
. $srcdir/diag.sh injectmsg 0 50000
injectmsg 0 50000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/mysql-asyn.sh
View File

@ -12,7 +12,7 @@ $ActionQueueTimeoutEnqueue 10000 # 10 second to make sure we do not loose due to
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 50000
injectmsg 0 50000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/mysql-basic-cnf6.sh
View File

@ -13,7 +13,7 @@ if $msg contains "msgnum" then {
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/mysql-basic-vg.sh
View File

@ -10,7 +10,7 @@ $ModLoad ../plugins/ommysql/.libs/ommysql
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup_vg
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown_vg
. $srcdir/diag.sh check-exit-vg

2
tests/mysql-basic.sh
View File

@ -10,7 +10,7 @@ $ModLoad ../plugins/ommysql/.libs/ommysql
'
mysql --user=rsyslog --password=testbench < testsuites/mysql-truncate.sql
startup
. $srcdir/diag.sh injectmsg 0 5000
injectmsg 0 5000
shutdown_when_empty
wait_shutdown
# note "-s" is requried to suppress the select "field header"

2
tests/nested-call-shutdown.sh
View File

@ -27,7 +27,7 @@ if $msg contains "msgnum:" then call rs1
'
startup
#tcpflood -p'$TCPFLOOD_PORT' -m10000
. $srcdir/diag.sh injectmsg 0 1000
injectmsg 0 1000
. $srcdir/diag.sh shutdown-immediate
wait_shutdown
# wo do not check reception - the main point is that we do not abort. The actual

2
tests/omfile-read-only-errmsg.sh
View File

@ -18,7 +18,7 @@ touch ${RSYSLOG2_OUT_LOG}
chmod 0400 ${RSYSLOG2_OUT_LOG}
ls -l rsyslog.ou*
startup
$srcdir/diag.sh injectmsg 0 1
injectmsg 0 1
shutdown_when_empty
wait_shutdown

2
tests/omfile-read-only.sh
View File

@ -25,7 +25,7 @@ touch ${RSYSLOG2_OUT_LOG}
chmod 0400 ${RSYSLOG2_OUT_LOG}
ls -l rsyslog.ou*
startup
$srcdir/diag.sh injectmsg 0 $messages
injectmsg 0 $messages
shutdown_when_empty
wait_shutdown
# we know that the output file is missing some messages, but it

2
tests/omprog-close-unresponsive-noterm.sh
View File

@ -33,7 +33,7 @@ main_queue(
'
startup
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown

2
tests/omprog-close-unresponsive-vg.sh
View File

@ -32,7 +32,7 @@ main_queue(
'
startup_vg
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown_vg

2
tests/omprog-close-unresponsive.sh
View File

@ -33,7 +33,7 @@ main_queue(
'
startup
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown

2
tests/omprog-defaults-vg.sh
View File

@ -23,7 +23,7 @@ template(name="outfmt" type="string" string="%msg%\n")
'
startup_vg
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown_vg

2
tests/omprog-defaults.sh
View File

@ -35,7 +35,7 @@ template(name="outfmt" type="string" string="%msg%\n")
'
startup
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown

2
tests/omprog-feedback-vg.sh
View File

@ -28,7 +28,7 @@ template(name="outfmt" type="string" string="%msg%\n")
'
startup_vg
. $srcdir/diag.sh wait-startup
. $srcdir/diag.sh injectmsg 0 10
injectmsg 0 10
. $srcdir/diag.sh wait-queueempty
shutdown_when_empty
wait_shutdown_vg

Some files were not shown because too many files have changed in this diff Show More