summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-02 17:18:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-02 17:18:43 +0200
commit90ed676c54c05cc87f0dbde96447abc8efc166d8 (patch)
tree06bba2fa1e6fd8e5ed70c13657f8c17ccd07a65a /tests
parente9c659c1578a114fa6e0d9cdf2729b60ba078a91 (diff)
parentb37a1eb0f8422102c11c597f15139d64c2d51c13 (diff)
downloadrsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.gz
rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.xz
rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.zip
Merge branch 'master' into v5-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tests')
-rwxr-xr-xtests/diskqueue.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh
index d2e75cbd..8233d569 100755
--- a/tests/diskqueue.sh
+++ b/tests/diskqueue.sh
@@ -9,6 +9,7 @@ echo diskqueue.sh: testing queue disk-only mode
source $srcdir/diag.sh init
source $srcdir/diag.sh startup diskqueue.conf
# 20000 messages should be enough - the disk test is slow enough ;)
+sleep 4
source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 20000
source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh wait-shutdown