From: Jan Stancek <[email protected]> Newer versions of rsyslog don't create empty log files during startup - the files are created upon first logged entry instead. (since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)
Don't check if log file gets created after service start, only make sure it exists after test generates a new log entry. Signed-off-by: Jiri Jaburek <[email protected]> Signed-off-by: Jan Stancek <[email protected]> --- testcases/kernel/syscalls/syslog/syslog01 | 11 +++++------ testcases/kernel/syscalls/syslog/syslog02 | 9 --------- testcases/kernel/syscalls/syslog/syslog05 | 10 +++++----- testcases/kernel/syscalls/syslog/syslog09 | 13 ++++++------- testcases/kernel/syscalls/syslog/syslog10 | 5 ----- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01 index b7bcd9e..2f3aea0 100755 --- a/testcases/kernel/syscalls/syslog/syslog01 +++ b/testcases/kernel/syscalls/syslog/syslog01 @@ -66,12 +66,6 @@ syslog_case1() restart_syslog_daemon - # check if $MAILLOG script exists - if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then - tst_resm TBROK "$MAILLOG no such log file" - cleanup 1 - fi - # Grepping pattern has to be changed whenever the executable name # changes, ex: syslogtst executable. # This check is neccessary for syslog-ng because $MAILLOG is @@ -87,6 +81,11 @@ syslog_case1() sleep 2 + if [ ! -e $MAILLOG ]; then + tst_resm TBROK "$MAILLOG no such log file" + cleanup 1 + fi + newvalue1=`grep -c "syslogtst: mail info test" $MAILLOG` if [ "x$(( $newvalue1 - $oldvalue1 ))" != "x1" ]; then status_flag=1 diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02 index a416344..7a55a84 100755 --- a/testcases/kernel/syscalls/syslog/syslog02 +++ b/testcases/kernel/syscalls/syslog/syslog02 @@ -65,15 +65,6 @@ syslog_case2() restart_syslog_daemon - # Grepping pattern is as follows: - # syslogtst: mail $level test. - # check if $MAILLOG script exists - if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then - tst_resm TBROK "$MAILLOG no such log file" - cleanup 1 - fi - - # Grepping pattern has to be changed whenever the executable name # changes, ex: syslogtst executable. # This check is neccessary for syslog-ng because $MAILLOG is diff --git a/testcases/kernel/syscalls/syslog/syslog05 b/testcases/kernel/syscalls/syslog/syslog05 index 7836993..40dd1fa 100755 --- a/testcases/kernel/syscalls/syslog/syslog05 +++ b/testcases/kernel/syscalls/syslog/syslog05 @@ -59,12 +59,12 @@ syslog_case5() restart_syslog_daemon # check if /var/log/messages script exists - if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ] - then - tst_resm TBROK "/var/log/messages no such log file" - cleanup 1 + if [ -e /var/log/messages ]; then + oldvalue=`grep -c "syslogtst: info to console test." /var/log/messages` + else + oldvalue=0 fi - oldvalue=`grep -c "syslogtst: info to console test." /var/log/messages` + # syslogtst does the disabling of /dev/syslog, sends the message and # enables /dev/syslog. if ! syslogtst 5 2>/dev/null; then diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09 index de06fb1..9cfafa8 100755 --- a/testcases/kernel/syscalls/syslog/syslog09 +++ b/testcases/kernel/syscalls/syslog/syslog09 @@ -56,15 +56,14 @@ syslog_case9() restart_syslog_daemon - # check if /var/log/messages script exists - if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then - tst_resm TBROK "/var/log/messages no such log file" - cleanup 1 + if [ -e /var/log/messages ]; then + allow1=`grep -c "syslogtst: error level is logged" /var/log/messages` + donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages` + else + allow1=0 + donot_allow1=0 fi - allow1=`grep -c "syslogtst: error level is logged" /var/log/messages` - donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages` - if ! syslogtst 9 2>/dev/null; then cleanup 1 fi diff --git a/testcases/kernel/syscalls/syslog/syslog10 b/testcases/kernel/syscalls/syslog/syslog10 index 3b9796d..573ab75 100755 --- a/testcases/kernel/syscalls/syslog/syslog10 +++ b/testcases/kernel/syscalls/syslog/syslog10 @@ -57,11 +57,6 @@ syslog_case10() restart_syslog_daemon - if [ ! -e /var/log/messages ]; then - tst_resm TBROK "/var/log/messages no such log file" - cleanup 1 - fi - if [ -e /var/log/messages ]; then allow1=`grep -c "syslogtst:10 error level is logged" /var/log/messages` donot_allow1=`grep -c "syslogtst:10 warning level not to be logged" /var/log/messages` -- 1.8.3.1 ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
