tests: zlogger nominally runs the daemon

[platform/core/system/dlog.git] / tests / dlog_test.in

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index eabca49..bb4b3f0 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -728,6 +728,8 @@ if [ "$quick" -ne 1 ]; then
        dlog_test_tid_filtering_secure_logging $type
 fi
 
+DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.test"
+
 dlog_logger -t 0 &
 LOGGER=$!
 sleep 1
@@ -1100,18 +1102,7 @@ test_verifytime && ok || fail
 
 DLOG_PREV_PATH=$DLOG_CONFIG_PATH
 
-LOG_DETAILS="testing if config has control over redirecting to stdout (1/3)"
-DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.stdout_enable.1"
-
-test_config_redirect 1 1 1 1 && ok || fail
-
-LOG_DETAILS="testing if config has control over redirecting to stdout (2/3)"
-DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.stdout_enable.2"
-test_config_redirect 0 0 1 1 && ok || fail
-
-LOG_DETAILS="testing if config has control over redirecting to stdout (3/3)"
-DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.stdout_enable.3"
-test_config_redirect 1 1 0 0 && ok || fail
+dlog_test_stdout_redirect $type
 
 DLOG_CONFIG_PATH=$DLOG_PREV_PATH
 
@@ -1121,76 +1112,7 @@ if [ "$quick" -ne 1 ]; then
                sleep 1
 
                dlog_test_backend_autodetection $type
-
-               rm "$TESTDIR"/test*
-
-               dlog_logger -t 0 &
-               LOGGER=$!
-               sleep 1
-
-               dlogsend -b main -t DLOG_LOGGER_TEST0 -c 100 "hi"
-               sleep 1
-               LOG_DETAILS="testing if logger daemon persistent logging works (1/3)"
-               [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
-               LOG_DETAILS="testing if logger daemon persistent logging works (2/3)"
-               [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test1)" -eq 100 ] && ok || fail
-               LOG_DETAILS="testing if logger daemon persistent logging works (3/3)"
-               [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test2)" -eq 0 ] && ok || fail
-
-               dlogsend -b main -t DLOG_LOGGER_TEST1 -c 500000 "hi"
-               sleep 1
-               RESULT=$(du -c "$TESTDIR"/test0* | tail -n 1 | cut -f 1)
-               LOG_DETAILS="testing if logger daemon log rotating works (1/2)"
-               [ "$RESULT" -gt 4096 ] && ok || fail # Min 4 MB
-               LOG_DETAILS="testing if logger daemon log rotating works (2/2)"
-               [ "$RESULT" -lt 6144 ] && ok || fail # Max 6 MB
-
-               dlogutil -cb main
-               kill $LOGGER > /dev/null
-               sleep 1
-               rm "$TESTDIR"/test0*
-               dlog_logger -t 5 -b 100000 &
-               LOGGER=$!
-               sleep 1
-
-               dlogsend -b main -t DLOG_LOGGER_TEST2 -c 100 "hi"
-               sleep 1
-               LOG_DETAILS="testing if logger daemon buffering works (1/5)"
-               [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test0)" -eq 0 ] && ok || fail
-
-               sleep 6
-               LOG_DETAILS="testing if logger daemon buffering works (2/5)"
-               [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
-
-               dlogsend -b main -t DLOG_LOGGER_TEST3 -c 100 "hi"
-               sleep 1
-               LOG_DETAILS="testing if logger daemon buffering works (3/5)"
-               [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test0)" -eq 0 ] && ok || fail
-
-               sleep 1
-               kill $LOGGER > /dev/null
-               LOGGER=-1
-               sleep 1
-               LOG_DETAILS="testing if logger daemon buffering works (4/5)"
-               [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
-
-               dlogutil -cb main
-
-               dlog_logger -t 10000 -b 100 &
-               LOGGER=$!
-               sleep 1
-
-               dlogsend -b main -t DLOG_LOGGER_TEST4 -c 100 "hi"
-               sleep 1
-               LOG_DETAILS="testing if logger daemon buffering works (5/5)"
-               [ "$(grep -c DLOG_LOGGER_TEST4 "$TESTDIR"/test0)" -gt 90 ] && ok || fail
-
-               dlogutil -cb main
-               kill $LOGGER > /dev/null
-               sleep 1
-               dlog_logger -t 0 &
-               LOGGER=$!
-               sleep 1
+               dlog_test_logger_buffering_logging $type
        fi
 
        dlog_logger -t 0 &