From: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
Signed-off-by: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
---
tests/expected/logger/errors-check_socket | 18 ++++++++++++++++++
tests/ts/logger/errors | 5 ++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/tests/expected/logger/errors-check_socket b/tests/expected/logger/errors-check_socket
index fa36c4e..76a877f 100644
--- a/tests/expected/logger/errors-check_socket
+++ b/tests/expected/logger/errors-check_socket
@@ -1 +1,19 @@
Check written socket data of all subtests.
+socket data, kern_priority:
+<8>Feb 13 23:31:30 prio: message
+socket data, kern_priority_numeric:
+<8>Feb 13 23:31:30 prio: message
+socket data, invalid_prio:
+
+socket data, rfc5424_exceed_size:
+<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc
+socket data, id_with_space:
+
+socket data, id_with_space:
+
+socket data, tag_with_space:
+<13>Feb 13 23:31:30 A B: tag_with_space
+socket data, tag_with_space:
+<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname A B - - [timeQuality tzKnown="1" isSynced="0"] tag_with_space_rfc5424
+socket data, rfc5424_msgid_with_space:
+
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors
index 8df97c8..e0a02dc 100755
--- a/tests/ts/logger/errors
+++ b/tests/ts/logger/errors
@@ -36,8 +36,11 @@ ts_init_socket_to_file $DEVLOG $SOCKIN
SOCAT_PID="$!"
function logger_fun {
- $TS_HELPER_LOGGER -u $DEVLOG -s --no-act "$@" >> "$TS_OUTPUT" 2>&1
+ # logger without --no-act to write all data to the socket
+ echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG
+ $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>&1
echo "ret: $?" >> "$TS_OUTPUT"
+ echo |socat -u - UNIX-CONNECT:$DEVLOG
}
ts_init_subtest "kern_priority"
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
