diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 14:03:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 14:03:46 +0200 |
| commit | 5ca0abc094de18ce2819c70e1727d4948fbc879f (patch) | |
| tree | 2181c68e6c9d4c02a4db386936fcae85f08ed993 /tests | |
| parent | 8b9cef552de558ecfd130451c4dea22676184d38 (diff) | |
| download | rsyslog-5ca0abc094de18ce2819c70e1727d4948fbc879f.tar.gz rsyslog-5ca0abc094de18ce2819c70e1727d4948fbc879f.tar.xz rsyslog-5ca0abc094de18ce2819c70e1727d4948fbc879f.zip | |
adjusting testbench to new (v4 enhanced) testing tools
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/badqi.sh | 2 | ||||
| -rwxr-xr-x | tests/discard.sh | 2 | ||||
| -rwxr-xr-x | tests/rsf_getenv.sh | 2 | ||||
| -rwxr-xr-x | tests/rulesetmultiqueue.sh | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/badqi.sh b/tests/badqi.sh index 81f8c1c2..28f76229 100755 --- a/tests/badqi.sh +++ b/tests/badqi.sh @@ -9,7 +9,7 @@ echo \[badqi.sh\]: test startup with invalid .qi file source $srcdir/diag.sh init source $srcdir/diag.sh startup badqi.conf # we just inject a handful of messages so that we have something to wait for... -source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 20 +source $srcdir/diag.sh tcpflood -m20 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh wait-shutdown # wait for process to terminate source $srcdir/diag.sh seq-check 0 19 diff --git a/tests/discard.sh b/tests/discard.sh index 9824b361..96006f01 100755 --- a/tests/discard.sh +++ b/tests/discard.sh @@ -10,7 +10,7 @@ source $srcdir/diag.sh init source $srcdir/diag.sh startup discard.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 10 1 +source $srcdir/diag.sh tcpflood -m10 -i1 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh seq-check 2 10 diff --git a/tests/rsf_getenv.sh b/tests/rsf_getenv.sh index 42de20fe..fd083bce 100755 --- a/tests/rsf_getenv.sh +++ b/tests/rsf_getenv.sh @@ -9,7 +9,7 @@ echo \[rsf_getenv.sh\]: testing RainerScript getenv\(\) function export MSGNUM="msgnum:" source $srcdir/diag.sh init source $srcdir/diag.sh startup rsf_getenv.conf -source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 10000 +source $srcdir/diag.sh tcpflood -m10000 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh seq-check 0 9999 diff --git a/tests/rulesetmultiqueue.sh b/tests/rulesetmultiqueue.sh index aff55148..71ed9dce 100755 --- a/tests/rulesetmultiqueue.sh +++ b/tests/rulesetmultiqueue.sh @@ -14,9 +14,9 @@ source $srcdir/diag.sh wait-startup # now fill the three files (a bit sequentially, but they should # still get their share of concurrency - to increase the chance # we use three connections per set). -source $srcdir/diag.sh tcpflood 127.0.0.1 13514 3 20000 0 -source $srcdir/diag.sh tcpflood 127.0.0.1 13515 3 20000 20000 -source $srcdir/diag.sh tcpflood 127.0.0.1 13516 3 20000 40000 +source $srcdir/diag.sh tcpflood -c3 -p13514 -m20000 -i0 +source $srcdir/diag.sh tcpflood -c3 -p13515 -m20000 -i20000 +source $srcdir/diag.sh tcpflood -c3 -p13516 -m20000 -i40000 # in this version of the imdiag, we do not have the capability to poll # all queues for emptyness. So we do a sleep in the hopes that this will |