diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 14:24:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 14:24:37 +0200 |
| commit | 13d4a23e92996e24d6a833ca75d06428c5387aa4 (patch) | |
| tree | 49d69b2c232ff94c627141fbaf9fdb6c57895f97 /tests | |
| parent | fc3e56941ca6dbf401bee2f9dc0f9e4c5cd87f40 (diff) | |
| download | rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.tar.gz rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.tar.xz rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.zip | |
some more fixes for queue engine
The enhanced testbench now runs without failures, again
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DiagTalker.java | 1 | ||||
| -rwxr-xr-x | tests/da-mainmsg-q.sh | 3 | ||||
| -rwxr-xr-x | tests/daqueue-persist-drvr.sh | 1 | ||||
| -rwxr-xr-x | tests/diag.sh | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/tests/DiagTalker.java b/tests/DiagTalker.java index 85a6671e..04e12327 100644 --- a/tests/DiagTalker.java +++ b/tests/DiagTalker.java @@ -34,6 +34,7 @@ public class DiagTalker { try { diagSocket = new Socket(host, port); + diagSocket.setSoTimeout(0); /* wait for lenghty operations */ out = new PrintWriter(diagSocket.getOutputStream(), true); in = new BufferedReader(new InputStreamReader( diagSocket.getInputStream())); diff --git a/tests/da-mainmsg-q.sh b/tests/da-mainmsg-q.sh index 25e7fd95..6ec2f3a9 100755 --- a/tests/da-mainmsg-q.sh +++ b/tests/da-mainmsg-q.sh @@ -27,8 +27,5 @@ source $srcdir/diag.sh injectmsg 2050 50 # clean up and check test result source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages -### currently, we get a stable abort if we use the former kill logic. With shutdown-when-empty, it hangs (but that still tells us there is a bug ;)) ### -#kill `cat rsyslog.pid` -echo seqchk? source $srcdir/diag.sh seq-check 2099 source $srcdir/diag.sh exit diff --git a/tests/daqueue-persist-drvr.sh b/tests/daqueue-persist-drvr.sh index 0ec76b47..7b6ec6dd 100755 --- a/tests/daqueue-persist-drvr.sh +++ b/tests/daqueue-persist-drvr.sh @@ -19,7 +19,6 @@ $srcdir/diag.sh shutdown-immediate $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh check-mainq-spool -echo DEBUG EXIT! #exit # restart engine and have rest processed diff --git a/tests/diag.sh b/tests/diag.sh index a34f3ede..ce323143 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -9,7 +9,7 @@ #valgrind="valgrind --tool=drd --log-fd=1" #valgrind="valgrind --tool=helgrind --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +#export RSYSLOG_DEBUG="debug nostdout printmutexaction" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason |