From: Ruediger Meier Date: Fri, 10 Apr 2015 06:28:26 +0000 (+0200) Subject: tests: add subtests for invalid logger devive X-Git-Tag: v2.27-rc1~266^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23719c0759ab7e7fce98181f43f7ec4dcf4017fa;p=thirdparty%2Futil-linux.git tests: add subtests for invalid logger devive Note --journald should not complain about invalid sockets. Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/logger/errors-check_socket b/tests/expected/logger/errors-check_socket index 76a877f6ad..7367dc0695 100644 --- a/tests/expected/logger/errors-check_socket +++ b/tests/expected/logger/errors-check_socket @@ -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 index 0000000000..5720afac64 --- /dev/null +++ b/tests/expected/logger/errors-invalid_socket @@ -0,0 +1,2 @@ +test_logger: socket /bad/boy: No such file or directory +ret: 1 diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors index e0a02dcdcd..0b232ecd10 100755 --- a/tests/ts/logger/errors +++ b/tests/ts/logger/errors @@ -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 diff --git a/tests/ts/logger/journald b/tests/ts/logger/journald index 81296f78ea..c10824c0e9 100755 --- a/tests/ts/logger/journald +++ b/tests/ts/logger/journald @@ -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