]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: add subtests for invalid logger devive
authorRuediger Meier <ruediger.meier@ga-group.nl>
Fri, 10 Apr 2015 06:28:26 +0000 (08:28 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 13 Apr 2015 12:48:57 +0000 (14:48 +0200)
Note --journald should not complain about invalid sockets.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
tests/expected/logger/errors-check_socket
tests/expected/logger/errors-invalid_socket [new file with mode: 0644]
tests/ts/logger/errors
tests/ts/logger/journald

index 76a877f6ada5fa4ff05f4c7c8c359df15cb3bd7d..7367dc0695c24601c19341fbbb430f9e31336d63 100644 (file)
@@ -17,3 +17,5 @@ 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:
 
+socket data, invalid_socket:
+
diff --git a/tests/expected/logger/errors-invalid_socket b/tests/expected/logger/errors-invalid_socket
new file mode 100644 (file)
index 0000000..5720afa
--- /dev/null
@@ -0,0 +1,2 @@
+test_logger: socket /bad/boy: No such file or directory
+ret: 1
index e0a02dcdcd9499d15f2793a3c02f5e463c716094..0b232ecd10057a4922076a6d8e5308c8c1c6d510 100755 (executable)
@@ -75,6 +75,10 @@ ts_init_subtest "rfc5424_msgid_with_space"
 logger_fun -t "rfc5424_msgid_with_space" --rfc5424 --msgid="A B" "message"
 ts_finalize_subtest
 
+ts_init_subtest "invalid_socket"
+logger_fun -u /bad/boy -t "invalid_socket" "message"
+ts_finalize_subtest
+
 ts_init_subtest "check_socket"
 ts_log "Check written socket data of all subtests."
 sleep 1
index 81296f78eac009afccecf3c7bb7758611b6b2dfb..c10824c0e94d5eb40a2e122f40d0df5c5a8fbaf1 100755 (executable)
@@ -30,6 +30,6 @@ if ! $TS_HELPER_LOGGER --help | grep -q journald; then
 fi
 
 printf "%s\n%s\n%s\n" MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a MESSAGE="a b c 1 2 3" |
-$TS_HELPER_LOGGER --no-act --journald --stderr > "$TS_OUTPUT" 2>&1
+$TS_HELPER_LOGGER -u /bad/boy --no-act --journald --stderr > "$TS_OUTPUT" 2>&1
 echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize