Merge pull request #4614 from rgerhards/fix-test

testbench: simplify test
This commit is contained in:
Rainer Gerhards 2021-06-24 16:02:09 +02:00 committed by GitHub
commit 7f0c2e3a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,8 +23,6 @@ module( load="../plugins/imtcp/.libs/imtcp"
StreamDriver.AuthMode="anon"
)
input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
'
startup
export PORT_RCVR=$TCPFLOOD_PORT
@ -32,9 +30,6 @@ export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
#valgrind="valgrind"
generate_conf 2
add_conf '
$DebugFile '$RSYSLOG_DEBUGLOG'
$DebugLevel 2
global(
defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert.pem'"
@ -46,6 +41,7 @@ global(
$ActionSendStreamDriverMode 1 # require TLS for the connection
$ActionSendStreamDriverAuthMode x509/certvalid
*.* @@127.0.0.1:'$PORT_RCVR'
action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
' 2
startup 2
@ -60,8 +56,6 @@ wait_shutdown 2
shutdown_when_empty
wait_shutdown
echo "DEBUG ${RSYSLOG_DEBUGLOG}"
cat ${RSYSLOG_DEBUGLOG}
content_check "not permitted to talk to peer, certificate invalid: certificate expired" ${RSYSLOG_DEBUGLOG}
content_check "not permitted to talk to peer, certificate invalid: certificate expired"
exit_test