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

Merge pull request #4088 from rgerhards/tb-robust

Browse Source 
testbench: modernize some tests and make more robust
This commit is contained in:
Rainer Gerhards 2020-01-03 14:53:43 +01:00 committed by GitHub
commit ad0390c34c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,14 @@
# added by Rainer Gerhards 2018-01-05 # added by Rainer Gerhards 2018-01-05
# part of the rsyslog project, released under ASL 2.0 # part of the rsyslog project, released under ASL 2.0
. ${srcdir:=.}/diag.sh init . ${srcdir:=.}/diag.sh init
export NUMMESSAGES=50 # sufficient for our needs!
export SEQ_CHECK_OPTIONS=-i2
check_sql_data_ready() {
mysql_get_data
seq_check --check-only
}
export QUEUE_EMPTY_CHECK_FUNC=check_sql_data_ready
generate_conf generate_conf
add_conf ' add_conf '
$ModLoad ../plugins/ommysql/.libs/ommysql $ModLoad ../plugins/ommysql/.libs/ommysql
@ -17,17 +25,16 @@ if((not($msg contains "error")) and ($msg contains "msgnum:")) then {
set $/cntr = 0; set $/cntr = 0;
} }
action(type="ommysql" name="mysql_action" server="127.0.0.1" template="tpl" action(type="ommysql" name="mysql_action" server="127.0.0.1" template="tpl"
db="'$RSYSLOG_DYNNAME'" uid="rsyslog" pwd="testbench" action.errorfile=`echo $RSYSLOG2_OUT_LOG`) db="'$RSYSLOG_DYNNAME'" uid="rsyslog" pwd="testbench" action.errorfile="'$RSYSLOG2_OUT_LOG'")
} }
' '
mysql_prep_for_test mysql_prep_for_test
startup startup
injectmsg 0 50 injectmsg
wait_file_lines "$RSYSLOG2_OUT_LOG" 25
shutdown_when_empty shutdown_when_empty
wait_shutdown wait_shutdown
export EXPECTED="$(cat ${srcdir}/testsuites/action-tx-errfile.result)" export EXPECTED="$(cat ${srcdir}/testsuites/action-tx-errfile.result)"
cmp_exact ${RSYSLOG2_OUT_LOG} cmp_exact ${RSYSLOG2_OUT_LOG}
mysql_get_data mysql_get_data
seq_check 0 49 -i2 seq_check
exit_test exit_test

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

@ -1,9 +1,16 @@
#!/bin/bash #!/bin/bash
# part of the rsyslog project, released under ASL 2.0
. ${srcdir:=.}/diag.sh init . ${srcdir:=.}/diag.sh init
export NUMMESSAGES=5000 export NUMMESSAGES=5000
export SEQ_CHECK_OPTIONS=-i2
check_sql_data_ready() {
mysql_get_data
seq_check --check-only
}
export QUEUE_EMPTY_CHECK_FUNC=check_sql_data_ready
generate_conf generate_conf
add_conf ' add_conf '
$ModLoad ../plugins/ommysql/.libs/ommysql module(load="../plugins/ommysql/.libs/ommysql")
global(errormessagestostderr.maxnumber="50") global(errormessagestostderr.maxnumber="50")
template(type="string" name="tpl" string="insert into SystemEvents (Message, Facility) values (\"%msg%\", %$!facility%)" option.sql="on") template(type="string" name="tpl" string="insert into SystemEvents (Message, Facility) values (\"%msg%\", %$!facility%)" option.sql="on")
@ -19,7 +26,7 @@ if($msg contains "msgnum:") then {
action(type="ommysql" name="mysql_action" server="127.0.0.1" template="tpl" action(type="ommysql" name="mysql_action" server="127.0.0.1" template="tpl"
db="'$RSYSLOG_DYNNAME'" uid="rsyslog" pwd="testbench") db="'$RSYSLOG_DYNNAME'" uid="rsyslog" pwd="testbench")
} }
action(type="omfile" file=`echo $RSYSLOG2_OUT_LOG`) action(type="omfile" file="'$RSYSLOG2_OUT_LOG'")
' '
mysql_prep_for_test mysql_prep_for_test
startup startup
@ -27,6 +34,5 @@ injectmsg
shutdown_when_empty shutdown_when_empty
wait_shutdown wait_shutdown
mysql_get_data mysql_get_data
export SEQ_CHECK_OPTIONS=-i2
seq_check seq_check
exit_test exit_test