systemtests: add stdout and stderr as destination to messages

bareos · Feb 11, 2020 · 795666e · 795666e
1 parent a7cc9e2
commit 795666e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/core/src/tests/messages.cc b/core/src/tests/messages.cc
@@ -95,6 +95,8 @@ static bool DbLogInsertCallback_(JobControlRecord* jcr,
 
 TEST(messages, send_message_to_all_configured_destinations)
 {
+  debug_level = 200;
+
   std::string config_dir = getenv_std_string("BAREOS_CONFIG_DIR");
   std::string working_dir = getenv_std_string("BAREOS_WORKING_DIR");
   std::string backend_dir = getenv_std_string("backenddir");

diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in
@@ -5,4 +5,6 @@ Messages {
   append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit
   catalog = all, !skipped, !saved, !audit
   syslog = all
+  stdout = all
+  stderr = all
 }
diff --git a/systemtests/tests/messages-test/testrunner b/systemtests/tests/messages-test/testrunner
@@ -15,11 +15,15 @@ export TestName
 console_messages_file="${working}"/.conmsg
 syslog_file="${working}"/syslog.txt
 dblog_file="${working}"/dblog.txt
+stdout_file="${working}"/stdout.txt
+stderr_file="${working}"/stderr.txt
 extra_append_file="${logdir}"/bareos.log
 
 rm -f "$console_messages_file"
 rm -f "$syslog_file"
 rm -f "$dblog_file"
+rm -f "$stdout_file"
+rm -f "$stderr_file"
 rm -f "$extra_append_file"
 
 function exit_error() {
@@ -39,11 +43,13 @@ function check_output_file {
 
 start_test
 
-${BAREOS_UNITTESTS_BINARY_DIR}/messages || exit_failure
+${BAREOS_UNITTESTS_BINARY_DIR}/messages > "$stdout_file" 2> "$stderr_file" || exit_error
 
 check_output_file "$console_messages_file"
 check_output_file "$syslog_file"
 check_output_file "$dblog_file"
+check_output_file "$stdout_file"
+check_output_file "$stderr_file"
 check_output_file "$extra_append_file"
 
 end_test