From: Karel Zak <kzak@redhat.com>
Date: Tue, 6 Oct 2015 08:17:11 +0000 (+0200)
Subject: tests: update and extend logger tests
X-Git-Tag: v2.28-rc1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b90a8f38fda1426ad02f31b6391c7495cd18bf9;p=thirdparty%2Futil-linux.git

tests: update and extend logger tests

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/logger/errors-check_socket b/tests/expected/logger/errors-check_socket
index 7367dc0695..3623a72218 100644
--- a/tests/expected/logger/errors-check_socket
+++ b/tests/expected/logger/errors-check_socket
@@ -1,20 +1,33 @@
 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, tcp:
+<13>Feb 13 23:31:30 tcp: message
+
+socket data, multi-line:
+<13>Feb 13 23:31:30 kzak: AAA
+<13>Feb 13 23:31:30 kzak: BBB
+<13>Feb 13 23:31:30 kzak: CCC
+
 socket data, rfc5424_msgid_with_space:
 
 socket data, invalid_socket:
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors
index d47c7bc1ee..71b34c8e99 100755
--- a/tests/ts/logger/errors
+++ b/tests/ts/logger/errors
@@ -44,6 +44,14 @@ function logger_fun {
 	echo |socat -u - UNIX-CONNECT:$DEVLOG
 }
 
+function logger_printf {
+	# logger without --no-act to write all data to the socket
+	echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG
+	printf "$1" | $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"
 logger_fun -t "prio" -p kern.emerg "message"
 ts_finalize_subtest
@@ -72,6 +80,14 @@ logger_fun -t "A B" "tag_with_space"
 logger_fun -t "A B" --rfc5424 "tag_with_space_rfc5424"
 ts_finalize_subtest
 
+ts_init_subtest "tcp"
+logger_fun --tcp -t "tcp" "message"
+ts_finalize_subtest
+
+ts_init_subtest "multi-line"
+logger_printf "AAA\nBBB\nCCC\n"
+ts_finalize_subtest
+
 ts_init_subtest "rfc5424_msgid_with_space"
 logger_fun -t "rfc5424_msgid_with_space" --rfc5424 --msgid="A B" "message"
 ts_finalize_subtest