diff options
| author | Ruediger Meier | 2015-04-09 17:12:34 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2015-04-13 13:24:34 +0200 |
| commit | c9813f2cbe1f4c92f5ebecdd5a22d9ff94affe82 (patch) | |
| tree | ca6d91e03e946e9620cd857114fb8cf61ef06999 /tests/ts/logger | |
| parent | tests: simplify common logger options (diff) | |
| download | kernel-qcow2-util-linux-c9813f2cbe1f4c92f5ebecdd5a22d9ff94affe82.tar.gz kernel-qcow2-util-linux-c9813f2cbe1f4c92f5ebecdd5a22d9ff94affe82.tar.xz kernel-qcow2-util-linux-c9813f2cbe1f4c92f5ebecdd5a22d9ff94affe82.zip | |
tests: logger with socat device
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/logger')
| -rwxr-xr-x | tests/ts/logger/errors | 10 | ||||
| -rwxr-xr-x | tests/ts/logger/formats | 10 | ||||
| -rwxr-xr-x | tests/ts/logger/options | 16 |
3 files changed, 32 insertions, 4 deletions
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors index debce7eab..2dfb4109c 100755 --- a/tests/ts/logger/errors +++ b/tests/ts/logger/errors @@ -30,8 +30,13 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456" export LOGGER_TEST_HOSTNAME="test-hostname" export LOGGER_TEST_GETPID="98765" +DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog" +SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin" +ts_init_socket_to_file $DEVLOG $SOCKIN +SOCAT_PID="$!" + function logger_fun { - $TS_HELPER_LOGGER -s --no-act "$@" >> "$TS_OUTPUT" 2>&1 + $TS_HELPER_LOGGER -u $DEVLOG -s --no-act "$@" >> "$TS_OUTPUT" 2>&1 echo "ret: $?" >> "$TS_OUTPUT" } @@ -67,4 +72,7 @@ ts_init_subtest "rfc5424_msgid_with_space" logger_fun -t "rfc5424_msgid_with_space" --rfc5424 --msgid="A B" "message" ts_finalize_subtest +sleep 1 +kill $SOCAT_PID + ts_finalize diff --git a/tests/ts/logger/formats b/tests/ts/logger/formats index d0e9d5c47..203c4d6f6 100755 --- a/tests/ts/logger/formats +++ b/tests/ts/logger/formats @@ -30,8 +30,13 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456" export LOGGER_TEST_HOSTNAME="test-hostname" export LOGGER_TEST_GETPID="98765" +DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog" +SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin" +ts_init_socket_to_file $DEVLOG $SOCKIN +SOCAT_PID="$!" + function logger_fun { - $TS_HELPER_LOGGER -s --no-act "$@" >> "$TS_OUTPUT" 2>&1 + $TS_HELPER_LOGGER -u $DEVLOG -s --no-act "$@" >> "$TS_OUTPUT" 2>&1 echo "ret: $?" >> "$TS_OUTPUT" } @@ -63,4 +68,7 @@ for facility in auth authpriv cron daemon ftp lpr mail news syslog user uucp loc done ts_finalize_subtest +sleep 1 +kill $SOCAT_PID + ts_finalize diff --git a/tests/ts/logger/options b/tests/ts/logger/options index 6bd323686..c77c65565 100755 --- a/tests/ts/logger/options +++ b/tests/ts/logger/options @@ -50,14 +50,26 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456" export LOGGER_TEST_HOSTNAME="test-hostname" export LOGGER_TEST_GETPID="98765" +DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog" +SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin" +ts_init_socket_to_file $DEVLOG $SOCKIN +SOCAT_PID="$!" + +function logger_fun { + $TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> "$TS_OUTPUT" 2>&1 + echo "ret: $?" >> "$TS_OUTPUT" +} + for i in "${tests_array[@]}"; do name="${i%%:*}" options="${i##*:}" ts_init_subtest "$name" - $TS_HELPER_LOGGER --stderr --no-act -t "test_tag" $options > "$TS_OUTPUT" 2>&1 - echo "ret: $?" >> "$TS_OUTPUT" + logger_fun -t "test_tag" $options ts_finalize_subtest done +sleep 1 +kill $SOCAT_PID + ts_finalize |