From: Karel Zak <kzak@redhat.com>
Date: Tue, 6 Oct 2015 09:06:21 +0000 (+0200)
Subject: tests: replace username with tag in logger test
X-Git-Tag: v2.28-rc1~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b5e362a98a7620116a83eda69bccda1e46f134;p=thirdparty%2Futil-linux.git

tests: replace username with tag in logger test

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 3623a72218..79a47f49d6 100644
--- a/tests/expected/logger/errors-check_socket
+++ b/tests/expected/logger/errors-check_socket
@@ -24,9 +24,9 @@ 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
+<13>Feb 13 23:31:30 multi: AAA
+<13>Feb 13 23:31:30 multi: BBB
+<13>Feb 13 23:31:30 multi: CCC
 
 socket data, rfc5424_msgid_with_space:
 
diff --git a/tests/expected/logger/errors-multi-line b/tests/expected/logger/errors-multi-line
index 50e8fc55f2..5247589465 100644
--- a/tests/expected/logger/errors-multi-line
+++ b/tests/expected/logger/errors-multi-line
@@ -1,4 +1,4 @@
-<13>Feb 13 23:31:30 kzak: AAA
-<13>Feb 13 23:31:30 kzak: BBB
-<13>Feb 13 23:31:30 kzak: CCC
+<13>Feb 13 23:31:30 multi: AAA
+<13>Feb 13 23:31:30 multi: BBB
+<13>Feb 13 23:31:30 multi: CCC
 ret: 0
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors
index 71b34c8e99..c0fab946fe 100755
--- a/tests/ts/logger/errors
+++ b/tests/ts/logger/errors
@@ -46,8 +46,10 @@ function logger_fun {
 
 function logger_printf {
 	# logger without --no-act to write all data to the socket
+	local fmt="$1"
+	shift
 	echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG
-	printf "$1" | $TS_HELPER_LOGGER -u $DEVLOG --stderr >> "$TS_OUTPUT" 2>&1
+	printf "$fmt" | $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>&1
 	echo "ret: $?" >> "$TS_OUTPUT"
 	echo |socat -u - UNIX-CONNECT:$DEVLOG
 }
@@ -85,7 +87,7 @@ logger_fun --tcp -t "tcp" "message"
 ts_finalize_subtest
 
 ts_init_subtest "multi-line"
-logger_printf "AAA\nBBB\nCCC\n"
+logger_printf "AAA\nBBB\nCCC\n" -t "multi"
 ts_finalize_subtest
 
 ts_init_subtest "rfc5424_msgid_with_space"