summaryrefslogtreecommitdiffstats
path: root/tests/imtcp-multiport.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-25 14:16:31 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-25 14:16:31 +0200
commitb9549380270fa68e27e8ee3f049c7d34156a85ff (patch)
treee19337d9e942ee0bc62fb08a60e0470b4868a344 /tests/imtcp-multiport.sh
parent7a7ec37f99f3dd5120952e6ca6263dd72061abb1 (diff)
downloadrsyslog-b9549380270fa68e27e8ee3f049c7d34156a85ff.tar.gz
rsyslog-b9549380270fa68e27e8ee3f049c7d34156a85ff.tar.xz
rsyslog-b9549380270fa68e27e8ee3f049c7d34156a85ff.zip
solved some issues with testbench & a race condition
Diffstat (limited to 'tests/imtcp-multiport.sh')
-rwxr-xr-xtests/imtcp-multiport.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/imtcp-multiport.sh b/tests/imtcp-multiport.sh
index aa1f15e8..17480dae 100755
--- a/tests/imtcp-multiport.sh
+++ b/tests/imtcp-multiport.sh
@@ -17,7 +17,7 @@ if [ "$?" -ne "0" ]; then
echo "error during tcpflood! see rsyslog.out.log.save for what was written"
cp rsyslog.out.log rsyslog.out.log.save
fi
-sleep 2 # we need this so that rsyslogd can receive all outstanding messages
+$srcdir/waitqueueempty.sh # wait until rsyslogd is done processing messages
kill `cat rsyslog.pid`
rm -f work
sort < rsyslog.out.log > work
@@ -42,7 +42,7 @@ if [ "$?" -ne "0" ]; then
echo "error during tcpflood! see rsyslog.out.log.save for what was written"
cp rsyslog.out.log rsyslog.out.log.save
fi
-sleep 2 # we need this so that rsyslogd can receive all outstanding messages
+$srcdir/waitqueueempty.sh # wait until rsyslogd is done processing messages
kill `cat rsyslog.pid`
rm -f work
sort < rsyslog.out.log > work
@@ -67,7 +67,7 @@ if [ "$?" -ne "0" ]; then
echo "error during tcpflood! see rsyslog.out.log.save for what was written"
cp rsyslog.out.log rsyslog.out.log.save
fi
-sleep 2 # we need this so that rsyslogd can receive all outstanding messages
+$srcdir/waitqueueempty.sh # wait until rsyslogd is done processing messages
kill `cat rsyslog.pid`
rm -f work
sort < rsyslog.out.log > work