mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-13 04:50:41 +01:00
845ffe603b
Make the test program explicitly flush lines written to stdout and stderr, and do not use stdbuf to force line buffering for stdout. In Python 2 stderr was unbuffered, but in Python 3 it is block-buffered when redirected to a file/pipe. Besides, stdbuf seems to have no effect on Python 3. This solves one of the problems with this test described in #3361. The problem ocurred with Python 3 and after the addition of the wait_file_lines check in v8.40.0. The buffering that Python did caused the last two lines of the output file to be written at shutdown time. Other minor fixes and consistency enhancements in other omprog tests.
58 lines
1.5 KiB
Bash
Executable File
58 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
# This file is part of the rsyslog project, released under ASL 2.0
|
|
|
|
# This test tests the 'output' setting of omprog when the feedback
|
|
# feature is not used (confirmMessages=off).
|
|
|
|
. ${srcdir:=.}/diag.sh init
|
|
generate_conf
|
|
add_conf '
|
|
module(load="../plugins/omprog/.libs/omprog")
|
|
|
|
template(name="outfmt" type="string" string="%msg%\n")
|
|
|
|
:msg, contains, "msgnum:" {
|
|
action(
|
|
type="omprog"
|
|
binary="'$srcdir'/testsuites/omprog-output-capture-bin.sh"
|
|
template="outfmt"
|
|
name="omprog_action"
|
|
output="'$RSYSLOG_OUT_LOG'"
|
|
fileCreateMode="0644" # default is 0600
|
|
)
|
|
}
|
|
'
|
|
startup
|
|
injectmsg 0 10
|
|
wait_file_lines "$RSYSLOG_OUT_LOG" 22
|
|
shutdown_when_empty
|
|
wait_shutdown
|
|
|
|
export EXPECTED="[stdout] Starting
|
|
[stderr] Starting
|
|
[stdout] Received msgnum:00000000:
|
|
[stderr] Received msgnum:00000000:
|
|
[stdout] Received msgnum:00000001:
|
|
[stderr] Received msgnum:00000001:
|
|
[stdout] Received msgnum:00000002:
|
|
[stderr] Received msgnum:00000002:
|
|
[stdout] Received msgnum:00000003:
|
|
[stderr] Received msgnum:00000003:
|
|
[stdout] Received msgnum:00000004:
|
|
[stderr] Received msgnum:00000004:
|
|
[stdout] Received msgnum:00000005:
|
|
[stderr] Received msgnum:00000005:
|
|
[stdout] Received msgnum:00000006:
|
|
[stderr] Received msgnum:00000006:
|
|
[stdout] Received msgnum:00000007:
|
|
[stderr] Received msgnum:00000007:
|
|
[stdout] Received msgnum:00000008:
|
|
[stderr] Received msgnum:00000008:
|
|
[stdout] Received msgnum:00000009:
|
|
[stderr] Received msgnum:00000009:
|
|
[stdout] Terminating normally
|
|
[stderr] Terminating normally"
|
|
cmp_exact $RSYSLOG_OUT_LOG
|
|
|
|
exit_test
|